diff --git a/pom.xml b/pom.xml index ed21472e..edd17069 100644 --- a/pom.xml +++ b/pom.xml @@ -7,9 +7,9 @@ ruoyi 4.3.1 - ruoyi - http://www.ruoyi.vip - 若依管理系统 + + + 4.3.1 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index a0e726bd..2be1aefa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -16,15 +16,5 @@ public class RuoYiApplication { // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(RuoYiApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticStProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticStProductController.java index 4635ef15..58289231 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticStProductController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/nanjing/StatisticStProductController.java @@ -1,18 +1,24 @@ package com.ruoyi.web.controller.nanjing; import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.nanjing.domain.QsProduct; +import com.ruoyi.nanjing.domain.QsStation; +import com.ruoyi.nanjing.domain.TBdProductinfo; +import com.ruoyi.nanjing.service.ITBdProductinfoService; import com.ruoyi.nanjing.service.ITBdProducttypeService; import com.ruoyi.system.domain.SysDept; 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.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Controller @RequestMapping("/nanjing/StatisticStation") @@ -22,21 +28,50 @@ public class StatisticStProductController extends BaseController { @Autowired private ITBdProducttypeService producttypeService; + @Autowired + private ITBdProductinfoService productinfoService; @RequiresPermissions("nanjing:stationStatistic:view") @GetMapping() - public String stationProduct() + public String stationProduct(ModelMap map) { + List tBdProductinfoList = productinfoService.selectTBdProductinfoList(new TBdProductinfo()); + map.addAttribute("list",tBdProductinfoList); return prefix + "/QsStation"; } @RequiresPermissions("nanjing:stationStatistic:list") @PostMapping("/list") @ResponseBody - public List list(QsProduct qsProduct) + public List list(QsStation qsStation) + { + List qsProducts = producttypeService.selectStationQs(qsStation); + return qsProducts; + } + + @PostMapping("/listAll") + @ResponseBody + public List listAll(String begin,String end) { -// List qsProducts = producttypeService.selectDeptList(qsProduct); -// return qsProducts; - return null; + Map map = new HashMap(); + map.put("begin",begin); + map.put("end",end); + map.put("productId",""); + map.put("productType",""); + List qsStations = producttypeService.selectAllQs(map); + return qsStations; } + @PostMapping("/nodeClick") + @ResponseBody + public List nodeClick(String begin,String end,String node) + { + Map map = new HashMap(); + map.put("begin",begin); + map.put("end",end); + map.put("stationId",node); + map.put("stationType",1); + map.put("productId","ALL"); + List qsStations = producttypeService.selectNodeQs(map); + return qsStations; + } } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 0614189e..cdee474a 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -1,13 +1,13 @@ # 项目相关配置 ruoyi: # 名称 - name: RuoYi + name: Nanjing # 版本 version: 4.3.1 # 版权年份 - copyrightYear: 2019 + copyrightYear: 2021 # 实例演示开关 - demoEnabled: true + demoEnabled: false # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） profile: D:/ruoyi/uploadPath # profile: /Users/sxile/MyWorkSpase/WorkSpase/uploadPath/RuoYi-SqlServer diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt index 94662592..864f2456 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/ruoyi-admin/src/main/resources/banner.txt @@ -1,24 +1,10 @@ Application Version: ${ruoyi.version} Spring Boot Version: ${spring-boot.version} -//////////////////////////////////////////////////////////////////// -// _ooOoo_ // -// o8888888o // -// 88" . "88 // -// (| ^_^ |) // -// O\ = /O // -// ____/`---'\____ // -// .' \\| |// `. // -// / \\||| : |||// \ // -// / _||||| -:- |||||- \ // -// | | \\\ - /// | | // -// | \_| ''\---/'' | | // -// \ .-\__ `-` ___/-. / // -// ___`. .' /--.--\ `. . ___ // -// ."" '< `.___\_<|>_/___.' >'"". // -// | | : `- \`.;`\ _ /`;.`/ - ` : | | // -// \ \ `-. \_ __\ /__ _/ .-` / / // -// ========`-.____`-.___\_____/___.-`____.-'======== // -// `=---=' // -// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // -// 佛祖保佑 永不宕机 永无BUG // -//////////////////////////////////////////////////////////////////// \ No newline at end of file +$$\ $$\ $$$$$$$$\ $$$$$$\ $$\ $$\ $$$$$$\ $$$$$$\ +$$$\ $$$ |$$ _____|$$ __$$\ $$$\ $$ |$$ __$$\ $$ __$$\ +$$$$\ $$$$ |$$ | $$ / \__|$$$$\ $$ |$$ / $$ |$$ / \__| +$$\$$\$$ $$ |$$$$$\ \$$$$$$\ $$ $$\$$ |$$$$$$$$ |$$ | +$$ \$$$ $$ |$$ __| \____$$\ $$ \$$$$ |$$ __$$ |$$ | +$$ |\$ /$$ |$$ | $$\ $$ |$$ |\$$$ |$$ | $$ |$$ | $$\ +$$ | \_/ $$ |$$$$$$$$\ \$$$$$$ |$$ | \$$ |$$ | $$ |\$$$$$$ | +\__| \__|\________| \______/ \__| \__|\__| \__| \______/ \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/img/icn.png b/ruoyi-admin/src/main/resources/static/img/icn.png new file mode 100644 index 00000000..e4a976d8 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/img/icn.png differ diff --git a/ruoyi-admin/src/main/resources/static/img/login-background.jpg b/ruoyi-admin/src/main/resources/static/img/login-background.jpg index adfa3f90..0fe0d083 100644 Binary files a/ruoyi-admin/src/main/resources/static/img/login-background.jpg and b/ruoyi-admin/src/main/resources/static/img/login-background.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/pay.png b/ruoyi-admin/src/main/resources/static/img/pay.png deleted file mode 100644 index c32dca19..00000000 Binary files a/ruoyi-admin/src/main/resources/static/img/pay.png and /dev/null differ diff --git a/ruoyi-admin/src/main/resources/static/img/qr_code.png b/ruoyi-admin/src/main/resources/static/img/qr_code.png deleted file mode 100644 index ecba6d6a..00000000 Binary files a/ruoyi-admin/src/main/resources/static/img/qr_code.png and /dev/null differ diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 0fdd5154..a0acef08 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ - 若依系统首页 + 生产线数据采集系统 @@ -26,7 +26,7 @@
@@ -36,19 +36,19 @@
- User Image + User Image

[[${user.loginName}]]

- 在线 + 注销
-
  • - 首页 -
    • + + +
  • @@ -182,12 +182,12 @@
      -
    • 视频教程
      • -
    • 开发文档
      • + +
    • 全屏显示
    • - +
        @@ -219,7 +219,7 @@ - - + + + +
        @@ -31,25 +31,26 @@
        + +
        • - + - - +
        • - + +
          • - - +
        • -  搜索 +  搜索
          • @@ -74,48 +75,95 @@ panehHidden = true; } $('body').layout({ initClosed: panehHidden, west__size: 185 }); - queryList(); + // queryList(); queryDeptTree(); }); - function queryList() { - var options = { - url: prefix + "/list", - exportUrl: prefix + "/export", - modalName: "整机合格率统计", + // function queryList(url) { + // console.log(url); + // var options = { + // // url: url, + // // exportUrl: prefix + "/export", + // modalName: "工位合格率统计", + // columns: [ + // { + // field: 'productTp', + // title: '机种类型' + // }, + // { + // field: 'inputNum', + // title: '投入量' + // }, + // { + // field: 'okNum', + // title: '合格品' + // }, + // { + // field:'noNum', + // title:'不合格品' + // }, + // { + // field:'ero', + // title:'异常' + // }, + // { + // field: 'allRate', + // title: '综合合格率', + // } + // ] + // }; + // $.table.init(options); + // } + + function searchAll(){ + // console.log("点击查询按钮事件执行..."); + var url = ctx + "nanjing/StatisticStation/listAll"; + // queryList(url); + $('#bootstrap-table').bootstrapTable('destroy'); + $('#bootstrap-table').bootstrapTable({ + method:"post", + url: url, + pagination: true, + search: true, + contentType : "application/x-www-form-urlencoded", + queryParams: { + begin:$('#startTime').val(), + end:$('#endTime').val() + }, + modalName: "工位合格率统计", columns: [ - { - field: 'productTp', - title: '机种类型' - }, - { - field: 'inputNum', - title: '投入量' - }, - { - field: 'okNum', - title: '合格品' - }, - { - field:'noNum', - title:'不合格品' - }, - { - field:'ero', - title:'异常' - }, - { - field: 'allRate', - title: '综合合格率', - } + { + field: 'productTp', + title: '机种类型' + }, + { + field: 'inputNum', + title: '投入量' + }, + { + field: 'okNum', + title: '合格品' + }, + { + field:'noNum', + title:'不合格品' + }, + { + field:'ero', + title:'异常' + }, + { + field: 'allRate', + title: '综合合格率', + } ] - }; - $.table.init(options); + }) } function queryDeptTree() { - var url = ctx + "nanjing/treeData"; + // console.log("加载树执行。。。。。。"); + var url = ctx + "nanjing/SubStation/treeData"; var options = { url: url, expandLevel: 2, @@ -124,11 +172,62 @@ $.tree.init(options); function zOnClick(event, treeId, treeNode) { + // queryList(prefix + "/list"); + console.log("点击节点工位ID"+treeNode.id); $("#stationId").val(treeNode.id); - // $("#parentId").val(treeNode.pId); - $.table.search(); + $("#parentId").val(treeNode.pId); + // $.table.search(); + $('#bootstrap-table').bootstrapTable('destroy'); + $('#bootstrap-table').bootstrapTable({ + method:"post", + url: prefix+"/nodeClick", + pagination: true, + search: true, + contentType : "application/x-www-form-urlencoded", + queryParams: + { + begin:$('#startTime').val(), + end:$('#endTime').val(), + node:$('#stationId').val() + }, + modalName: "工位合格率统计", + columns: [ + { + field: 'stationCode', + title: '工位代码' + }, + { + field: 'stationName', + title: '工位名称' + }, + { + field: 'inputNum', + title: '总数量' + }, + { + field: 'okNum', + title: '合格数量' + }, + { + field:'ero', + title:'异常数量' + }, + { + field: 'allRate', + title: '合格率', + } + ] + }) + } } + + /* 工位信息 */ + function dept() { + var url = ctx + "nanjing/SubStation/list"; + $.modal.openTab("工位信息", url); + } + $('#btnExpand').click(function() { $._tree.expandAll(true); $(this).hide(); diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-generator/src/main/resources/generator.yml index f3792cdc..8eb73129 100644 --- a/ruoyi-generator/src/main/resources/generator.yml +++ b/ruoyi-generator/src/main/resources/generator.yml @@ -2,9 +2,9 @@ # 代码生成 gen: # 作者 - author: ruoyi + author: limy # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.system + packageName: com.ruoyi.nanjing # 自动去除表前缀，默认是false autoRemovePre: false # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/QsProduct.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/QsProduct.java index bc393965..dc412d7c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/QsProduct.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/QsProduct.java @@ -20,10 +20,16 @@ public class QsProduct extends BaseEntity { private String ero; @Excel(name = "综合合格率") private String allRate; + private Date beginTime; private Date endTime; + private String productType; + //工位合格率统计 + private String productId; + private String stationId; + public String getProductTp() { return productTp; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/QsStation.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/QsStation.java new file mode 100644 index 00000000..e3b44088 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/QsStation.java @@ -0,0 +1,107 @@ +package com.ruoyi.nanjing.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +import java.util.Date; + +public class QsStation extends BaseEntity { + private static final long serialVersionUID = 1L; + + private String stationCode; + private String stationName; + @Excel(name = "总数量") + private String inputNum; + @Excel(name = "合格数量") + private String okNum; + @Excel(name = "异常数量") + private String ero; + @Excel(name = "合格率") + private String allRate; + + private Date beginTime; + private Date endTime; + + private String productId; + private String stationId; + + public String getStationCode() { + return stationCode; + } + + public void setStationCode(String stationCode) { + this.stationCode = stationCode; + } + + public String getStationName() { + return stationName; + } + + public void setStationName(String stationName) { + this.stationName = stationName; + } + + public String getInputNum() { + return inputNum; + } + + public void setInputNum(String inputNum) { + this.inputNum = inputNum; + } + + public String getOkNum() { + return okNum; + } + + public void setOkNum(String okNum) { + this.okNum = okNum; + } + + public String getEro() { + return ero; + } + + public void setEro(String ero) { + this.ero = ero; + } + + public String getAllRate() { + return allRate; + } + + public void setAllRate(String allRate) { + this.allRate = allRate; + } + + public Date getBeginTime() { + return beginTime; + } + + public void setBeginTime(Date beginTime) { + this.beginTime = beginTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public String getProductId() { + return productId; + } + + public void setProductId(String productId) { + this.productId = productId; + } + + public String getStationId() { + return stationId; + } + + public void setStationId(String stationId) { + this.stationId = stationId; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TBdSubstation.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TBdSubstation.java index 9c96d1b5..ea1ce4c9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TBdSubstation.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/domain/TBdSubstation.java @@ -112,6 +112,16 @@ public class TBdSubstation extends BaseEntity // @Excel(name = "限制id") private String LimitID; + public Long getParentId() { + return parentId; + } + + public void setParentId(Long parentId) { + this.parentId = parentId; + } + + private Long parentId; + /** 图片路径 */ // @Excel(name = "图片路径") private String ImageUrl; diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProducttypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProducttypeMapper.java index 90f31113..1951f1ab 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProducttypeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/mapper/TBdProducttypeMapper.java @@ -3,10 +3,7 @@ package com.ruoyi.nanjing.mapper; import java.util.List; import java.util.Map; -import com.ruoyi.nanjing.domain.ProRpList; -import com.ruoyi.nanjing.domain.QsProduct; -import com.ruoyi.nanjing.domain.QtProduct; -import com.ruoyi.nanjing.domain.TBdProducttype; +import com.ruoyi.nanjing.domain.*; /** * 机种类型Mapper接口 @@ -34,4 +31,8 @@ public interface TBdProducttypeMapper List selectQsProductList(Map map); List selectQ1ProductList(Map map); + + List selectStationQs(Map map); + + List selectAllQs(Map map); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProducttypeService.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProducttypeService.java index 86392665..d1120383 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProducttypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/ITBdProducttypeService.java @@ -33,4 +33,10 @@ public interface ITBdProducttypeService List selectQsProductList(Map map); List selectQ1ProductList(Map map); + + List selectStationQs(QsStation qsStation); + + List selectAllQs(Map map); + + List selectNodeQs(Map map); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProducttypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProducttypeServiceImpl.java index 25887d97..fb61484a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProducttypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdProducttypeServiceImpl.java @@ -1,15 +1,13 @@ package com.ruoyi.nanjing.service.impl; +import java.util.HashMap; import java.util.List; import java.util.Map; -import com.ruoyi.nanjing.domain.ProRpList; -import com.ruoyi.nanjing.domain.QsProduct; -import com.ruoyi.nanjing.domain.QtProduct; +import com.ruoyi.nanjing.domain.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.nanjing.mapper.TBdProducttypeMapper; -import com.ruoyi.nanjing.domain.TBdProducttype; import com.ruoyi.nanjing.service.ITBdProducttypeService; import com.ruoyi.common.core.text.Convert; @@ -61,4 +59,26 @@ public class TBdProducttypeServiceImpl implements ITBdProducttypeService public List selectQ1ProductList(Map map) { return tBdProducttypeMapper.selectQ1ProductList(map); } + + @Override + public List selectStationQs(QsStation qsStation) { + Map map = new HashMap(); + map.put("begin",qsStation.getBeginTime()); + map.put("end",qsStation.getEndTime()); + map.put("stationType",1); + map.put("stationId",qsStation.getStationId()); + map.put("productId",qsStation.getProductId()); + List list = tBdProducttypeMapper.selectStationQs(map); + return list; + } + + @Override + public List selectAllQs(Map map) { + return tBdProducttypeMapper.selectAllQs(map); + } + + @Override + public List selectNodeQs(Map map) { + return tBdProducttypeMapper.selectStationQs(map); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java index a4d7da65..a29966e6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/nanjing/service/impl/TBdSubstationServiceImpl.java @@ -145,7 +145,7 @@ public class TBdSubstationServiceImpl implements ITBdSubstationService Ztree ztree = new Ztree(); ztree.setId(substation1.getStationID()); -// ztree.setpId(substation1.getParentId()); + ztree.setpId(substation1.getParentId()); ztree.setName(substation1.getStationName()); ztree.setTitle(substation1.getStationName()); if (isCheck) diff --git a/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml b/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml index 4ba661e6..370acb98 100644 --- a/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/nanjing/TBdProducttypeMapper.xml @@ -42,6 +42,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + select ID, ProductTypeID, ProductTypeName from T_BD_ProductType @@ -108,6 +117,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" } + + +