diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MouthController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MouthController.java index d6350f5..948adaf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MouthController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MouthController.java @@ -3,6 +3,7 @@ package com.ruoyi.web.controller.broad; import com.alibaba.fastjson.JSONArray; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.system.domain.BasePictureLocation; +import com.ruoyi.system.service.IBaseNumberQaService; import com.ruoyi.system.service.IBasePictureLocationService; import com.ruoyi.system.service.IBaseUserManyiduService; import com.ruoyi.system.service.IBroadDataService; @@ -65,4 +66,12 @@ public class MouthController { return JSONArray.toJSONString(service.yue_selectMonthQANumber()); } + @Autowired + private IBaseNumberQaService baseNumberQaService; + @PostMapping("/selectMonthNumberQaS") + @ApiOperation("数字化安全") + private String selectMonthNumberQaS(){ + return JSONArray.toJSONString(baseNumberQaService.selectMonthNumberQaS()); + } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseNumberQaController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseNumberQaController.java new file mode 100644 index 0000000..fbd642e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseNumberQaController.java @@ -0,0 +1,127 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.BaseNumberQa; +import com.ruoyi.system.service.IBaseNumberQaService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 月看板-数字化安全维护Controller + * + * @author ruoyi + * @date 2022-07-28 + */ +@Controller +@RequestMapping("/system/base_number_qa") +public class BaseNumberQaController extends BaseController +{ + private String prefix = "system/base_number_qa"; + + @Autowired + private IBaseNumberQaService baseNumberQaService; + + @RequiresPermissions("system:base_number_qa:view") + @GetMapping() + public String base_number_qa() + { + return prefix + "/base_number_qa"; + } + + /** + * 查询月看板-数字化安全维护列表 + */ + @RequiresPermissions("system:base_number_qa:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseNumberQa baseNumberQa) + { + startPage(); + List list = baseNumberQaService.selectBaseNumberQaList(baseNumberQa); + return getDataTable(list); + } + + /** + * 导出月看板-数字化安全维护列表 + */ + @RequiresPermissions("system:base_number_qa:export") + @Log(title = "月看板-数字化安全维护", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseNumberQa baseNumberQa) + { + List list = baseNumberQaService.selectBaseNumberQaList(baseNumberQa); + ExcelUtil util = new ExcelUtil(BaseNumberQa.class); + return util.exportExcel(list, "月看板-数字化安全维护数据"); + } + + /** + * 新增月看板-数字化安全维护 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存月看板-数字化安全维护 + */ + @RequiresPermissions("system:base_number_qa:add") + @Log(title = "月看板-数字化安全维护", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseNumberQa baseNumberQa) + { + return toAjax(baseNumberQaService.insertBaseNumberQa(baseNumberQa)); + } + + /** + * 修改月看板-数字化安全维护 + */ + @RequiresPermissions("system:base_number_qa:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + BaseNumberQa baseNumberQa = baseNumberQaService.selectBaseNumberQaById(id); + mmap.put("baseNumberQa", baseNumberQa); + return prefix + "/edit"; + } + + /** + * 修改保存月看板-数字化安全维护 + */ + @RequiresPermissions("system:base_number_qa:edit") + @Log(title = "月看板-数字化安全维护", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseNumberQa baseNumberQa) + { + return toAjax(baseNumberQaService.updateBaseNumberQa(baseNumberQa)); + } + + /** + * 删除月看板-数字化安全维护 + */ + @RequiresPermissions("system:base_number_qa:remove") + @Log(title = "月看板-数字化安全维护", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(baseNumberQaService.deleteBaseNumberQaByIds(ids)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseNumberQa.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseNumberQa.java new file mode 100644 index 0000000..8664181 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseNumberQa.java @@ -0,0 +1,94 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 月看板-数字化安全维护对象 base_number_qa + * + * @author ruoyi + * @date 2022-07-28 + */ +public class BaseNumberQa extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 年份 */ + @Excel(name = "年份") + private Long yearName; + + /** 月份 */ + @Excel(name = "月份") + private Long monthName; + + /** 隐患数 */ + @Excel(name = "隐患数") + private Long qaNumber; + + /** 闭环数 */ + @Excel(name = "闭环数") + private Long bhNumber; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setYearName(Long yearName) + { + this.yearName = yearName; + } + + public Long getYearName() + { + return yearName; + } + public void setMonthName(Long monthName) + { + this.monthName = monthName; + } + + public Long getMonthName() + { + return monthName; + } + public void setQaNumber(Long qaNumber) + { + this.qaNumber = qaNumber; + } + + public Long getQaNumber() + { + return qaNumber; + } + public void setBhNumber(Long bhNumber) + { + this.bhNumber = bhNumber; + } + + public Long getBhNumber() + { + return bhNumber; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("yearName", getYearName()) + .append("monthName", getMonthName()) + .append("qaNumber", getQaNumber()) + .append("bhNumber", getBhNumber()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseNumberQaMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseNumberQaMapper.java new file mode 100644 index 0000000..299e8f4 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseNumberQaMapper.java @@ -0,0 +1,63 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.BaseNumberQa; + +/** + * 月看板-数字化安全维护Mapper接口 + * + * @author ruoyi + * @date 2022-07-28 + */ +public interface BaseNumberQaMapper +{ + /** + * 查询月看板-数字化安全维护 + * + * @param id 月看板-数字化安全维护主键 + * @return 月看板-数字化安全维护 + */ + public BaseNumberQa selectBaseNumberQaById(Long id); + + /** + * 查询月看板-数字化安全维护列表 + * + * @param baseNumberQa 月看板-数字化安全维护 + * @return 月看板-数字化安全维护集合 + */ + public List selectBaseNumberQaList(BaseNumberQa baseNumberQa); + + /** + * 新增月看板-数字化安全维护 + * + * @param baseNumberQa 月看板-数字化安全维护 + * @return 结果 + */ + public int insertBaseNumberQa(BaseNumberQa baseNumberQa); + + /** + * 修改月看板-数字化安全维护 + * + * @param baseNumberQa 月看板-数字化安全维护 + * @return 结果 + */ + public int updateBaseNumberQa(BaseNumberQa baseNumberQa); + + /** + * 删除月看板-数字化安全维护 + * + * @param id 月看板-数字化安全维护主键 + * @return 结果 + */ + public int deleteBaseNumberQaById(Long id); + + /** + * 批量删除月看板-数字化安全维护 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseNumberQaByIds(String[] ids); + + List selectMonthNumberQaS(); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseNumberQaService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseNumberQaService.java new file mode 100644 index 0000000..04dc919 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseNumberQaService.java @@ -0,0 +1,63 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.BaseNumberQa; + +/** + * 月看板-数字化安全维护Service接口 + * + * @author ruoyi + * @date 2022-07-28 + */ +public interface IBaseNumberQaService +{ + /** + * 查询月看板-数字化安全维护 + * + * @param id 月看板-数字化安全维护主键 + * @return 月看板-数字化安全维护 + */ + public BaseNumberQa selectBaseNumberQaById(Long id); + + /** + * 查询月看板-数字化安全维护列表 + * + * @param baseNumberQa 月看板-数字化安全维护 + * @return 月看板-数字化安全维护集合 + */ + public List selectBaseNumberQaList(BaseNumberQa baseNumberQa); + + /** + * 新增月看板-数字化安全维护 + * + * @param baseNumberQa 月看板-数字化安全维护 + * @return 结果 + */ + public int insertBaseNumberQa(BaseNumberQa baseNumberQa); + + /** + * 修改月看板-数字化安全维护 + * + * @param baseNumberQa 月看板-数字化安全维护 + * @return 结果 + */ + public int updateBaseNumberQa(BaseNumberQa baseNumberQa); + + /** + * 批量删除月看板-数字化安全维护 + * + * @param ids 需要删除的月看板-数字化安全维护主键集合 + * @return 结果 + */ + public int deleteBaseNumberQaByIds(String ids); + + /** + * 删除月看板-数字化安全维护信息 + * + * @param id 月看板-数字化安全维护主键 + * @return 结果 + */ + public int deleteBaseNumberQaById(Long id); + + List selectMonthNumberQaS(); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseNumberQaServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseNumberQaServiceImpl.java new file mode 100644 index 0000000..9912fe1 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseNumberQaServiceImpl.java @@ -0,0 +1,101 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.BaseNumberQaMapper; +import com.ruoyi.system.domain.BaseNumberQa; +import com.ruoyi.system.service.IBaseNumberQaService; +import com.ruoyi.common.core.text.Convert; + +/** + * 月看板-数字化安全维护Service业务层处理 + * + * @author ruoyi + * @date 2022-07-28 + */ +@Service +public class BaseNumberQaServiceImpl implements IBaseNumberQaService +{ + @Autowired + private BaseNumberQaMapper baseNumberQaMapper; + + /** + * 查询月看板-数字化安全维护 + * + * @param id 月看板-数字化安全维护主键 + * @return 月看板-数字化安全维护 + */ + @Override + public BaseNumberQa selectBaseNumberQaById(Long id) + { + return baseNumberQaMapper.selectBaseNumberQaById(id); + } + + /** + * 查询月看板-数字化安全维护列表 + * + * @param baseNumberQa 月看板-数字化安全维护 + * @return 月看板-数字化安全维护 + */ + @Override + public List selectBaseNumberQaList(BaseNumberQa baseNumberQa) + { + return baseNumberQaMapper.selectBaseNumberQaList(baseNumberQa); + } + + /** + * 新增月看板-数字化安全维护 + * + * @param baseNumberQa 月看板-数字化安全维护 + * @return 结果 + */ + @Override + public int insertBaseNumberQa(BaseNumberQa baseNumberQa) + { + baseNumberQa.setCreateTime(DateUtils.getNowDate()); + return baseNumberQaMapper.insertBaseNumberQa(baseNumberQa); + } + + /** + * 修改月看板-数字化安全维护 + * + * @param baseNumberQa 月看板-数字化安全维护 + * @return 结果 + */ + @Override + public int updateBaseNumberQa(BaseNumberQa baseNumberQa) + { + return baseNumberQaMapper.updateBaseNumberQa(baseNumberQa); + } + + /** + * 批量删除月看板-数字化安全维护 + * + * @param ids 需要删除的月看板-数字化安全维护主键 + * @return 结果 + */ + @Override + public int deleteBaseNumberQaByIds(String ids) + { + return baseNumberQaMapper.deleteBaseNumberQaByIds(Convert.toStrArray(ids)); + } + + /** + * 删除月看板-数字化安全维护信息 + * + * @param id 月看板-数字化安全维护主键 + * @return 结果 + */ + @Override + public int deleteBaseNumberQaById(Long id) + { + return baseNumberQaMapper.deleteBaseNumberQaById(id); + } + + @Override + public List selectMonthNumberQaS() { + return baseNumberQaMapper.selectMonthNumberQaS(); + } +} diff --git a/ruoyi-system/src/main/resources/createsql/base_number_qaMenu.sql b/ruoyi-system/src/main/resources/createsql/base_number_qaMenu.sql new file mode 100644 index 0000000..9084903 --- /dev/null +++ b/ruoyi-system/src/main/resources/createsql/base_number_qaMenu.sql @@ -0,0 +1,27 @@ +-- 菜单 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(2100, '月看板-数字化安全维护', '5', '1', '/system/base_number_qa', 'C', '0', 'system:base_number_qa:view', '#', 'admin', sysdate, '', null, '月看板-数字化安全维护菜单'); + +-- 按钮 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '月看板-数字化安全维护查询', 2100, '1', '#', 'F', '0', 'system:base_number_qa:list', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '月看板-数字化安全维护新增', 2100, '2', '#', 'F', '0', 'system:base_number_qa:add', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '月看板-数字化安全维护修改', 2100, '3', '#', 'F', '0', 'system:base_number_qa:edit', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '月看板-数字化安全维护删除', 2100, '4', '#', 'F', '0', 'system:base_number_qa:remove', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '月看板-数字化安全维护导出', 2100, '5', '#', 'F', '0', 'system:base_number_qa:export', '#', 'admin', sysdate, '', null, ''); + +-- base_number_qa主键序列 +create sequence seq_base_number_qa +increment by 1 +start with 10 +nomaxvalue +nominvalue +cache 20; diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseNumberQaMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseNumberQaMapper.xml new file mode 100644 index 0000000..a844b2b --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/BaseNumberQaMapper.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + select id, year_name, month_name, qa_number, bh_number, create_time from base_number_qa + + + + + + + + + + SELECT seq_base_number_qa.NEXTVAL as id FROM DUAL + + insert into base_number_qa + + id, + year_name, + month_name, + qa_number, + bh_number, + create_time, + + + #{id}, + #{yearName}, + #{monthName}, + #{qaNumber}, + #{bhNumber}, + #{createTime}, + + + + + update base_number_qa + + year_name = #{yearName}, + month_name = #{monthName}, + qa_number = #{qaNumber}, + bh_number = #{bhNumber}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from base_number_qa where id = #{id} + + + + delete from base_number_qa where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 4e7d323..5bff795 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -1412,7 +1412,7 @@ where 600 < ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM from IMOS_PR_PRODUCT_BARCODE where PRODUCTION_DATE > LAST_DAY(ADD_MONTHS( to_date(to_char(SYSDATE, 'yyyy-MM-dd') || '00:00:00', 'yyyy-MM-dd hh24:mi:ss') - , -1)) + 1) * 100, 2) as qty, + , -1)) + 1) * 100, 2) as rate, name from ( select count(1) as qty, diff --git a/ruoyi-system/src/main/resources/templates/system/base_number_qa/add.html b/ruoyi-system/src/main/resources/templates/system/base_number_qa/add.html new file mode 100644 index 0000000..2c5185f --- /dev/null +++ b/ruoyi-system/src/main/resources/templates/system/base_number_qa/add.html @@ -0,0 +1,49 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/templates/system/base_number_qa/base_number_qa.html b/ruoyi-system/src/main/resources/templates/system/base_number_qa/base_number_qa.html new file mode 100644 index 0000000..e82da60 --- /dev/null +++ b/ruoyi-system/src/main/resources/templates/system/base_number_qa/base_number_qa.html @@ -0,0 +1,104 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/templates/system/base_number_qa/edit.html b/ruoyi-system/src/main/resources/templates/system/base_number_qa/edit.html new file mode 100644 index 0000000..a9736a6 --- /dev/null +++ b/ruoyi-system/src/main/resources/templates/system/base_number_qa/edit.html @@ -0,0 +1,50 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file