diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index 783c228b..60a0548b 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -11,6 +11,7 @@ }, "dependencies": { "@antv/data-set": "^0.11.4", + "@jeecg/antd-online-mini": "2.4.5-RC", "@jiaminghi/data-view": "^2.10.0", "@tinymce/tinymce-vue": "2.1.0", "@toast-ui/editor": "^2.1.2", diff --git a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue index 4c58a714..96a52a63 100644 --- a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue +++ b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue @@ -6,7 +6,7 @@ 暂无数据!
-

辅料{{index+1}}信息

+

辅料信息

@@ -22,7 +22,7 @@ - {{item.picture}} + 暂无图片 @@ -91,6 +91,8 @@ //正确给 cData 赋值的 方法 model: function(newVal,oldVal){ this.tableModel= newVal + console.log('this.tableModel') + console.log(this.tableModel) // 设置默认值 if(newVal == null){ this.tableModel = [ diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue index 8593c18f..3e7875b9 100644 --- a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue +++ b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue @@ -39,11 +39,8 @@ import processFabric from '@/components/procedure/processFabric' this.visible = true; this.$http.get('/accessories/zyAccessories/queryById?id='+id).then( res=>{ - - if(this.model == ''){ - this.model.push(res.result) - console.log(1) - } + this.model=[]; + this.model.push(res.result); }) }, handleOk() { diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue index c411e711..2d8481e9 100644 --- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue +++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue @@ -300,4 +300,7 @@ export default { \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index 76b381ad..0fdc2539 100644 --- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -128,6 +128,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/zyShopOrder/shopOrder/**","anon"); //大屏数据 filterChainDefinitionMap.put("/largeScreen/**","anon"); + filterChainDefinitionMap.put("/productionLargeScreen/**","anon"); //人员管理 filterChainDefinitionMap.put("/zyPerson/**","anon"); diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java index 72146c01..b4f161aa 100644 --- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java +++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java @@ -154,6 +154,7 @@ public class ZyAccessoriesController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { ZyAccessories zyAccessories = zyAccessoriesService.getById(id); + zyAccessories.setPicture("http://localhost:10085/jeecg-boot/sys/common/static/"+zyAccessories.getPicture()); if(zyAccessories==null) { return Result.error("未找到对应数据"); } diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml index f5d0e640..df6bef7e 100644 --- a/jeecg-boot/jeecg-boot-module-system/pom.xml +++ b/jeecg-boot/jeecg-boot-module-system/pom.xml @@ -135,11 +135,11 @@ 5.2.4.RELEASE - + com.hynnet diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/controller/LargeScreenController.java similarity index 98% rename from jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java rename to jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/controller/LargeScreenController.java index da82cbee..1aac3ac4 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/LargeScreenController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/controller/LargeScreenController.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.largeScreen; +package org.jeecg.modules.largeScreen.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/controller/ProductionLargeScreenController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/controller/ProductionLargeScreenController.java new file mode 100644 index 00000000..8e452b39 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/controller/ProductionLargeScreenController.java @@ -0,0 +1,36 @@ +package org.jeecg.modules.largeScreen.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.largeScreen.service.ProductionLargeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +@Api(tags = "生产设备大屏数据") +@RequestMapping("/productionLargeScreen") +@RestController +@Slf4j +public class ProductionLargeScreenController { + + @Autowired + private ProductionLargeService productionLargeService; + + /** + * 查询订单的状态 + * + * @return + */ + @ApiOperation(value = "获取生产设备大屏数据", notes = "获取生产设备大屏数据") + @GetMapping("/getData") + public Result getData() { + Map data = productionLargeService.getData(); + return Result.OK(data); + } + +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/ProductionLargeService.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/ProductionLargeService.java new file mode 100644 index 00000000..cacff101 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/ProductionLargeService.java @@ -0,0 +1,8 @@ +package org.jeecg.modules.largeScreen.service; + +import java.util.Map; + +public interface ProductionLargeService { + + Map getData(); +} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/impl/ProductionLargeServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/impl/ProductionLargeServiceImpl.java new file mode 100644 index 00000000..41fde517 --- /dev/null +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/largeScreen/service/impl/ProductionLargeServiceImpl.java @@ -0,0 +1,70 @@ +package org.jeecg.modules.largeScreen.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.jeecg.modules.hanger.entity.HangRecord; +import org.jeecg.modules.hanger.service.IHangRecordService; +import org.jeecg.modules.largeScreen.service.ProductionLargeService; +import org.jeecg.modules.productplan.entity.ZyPlanProcess; +import org.jeecg.modules.productplan.entity.ZyProductPlan; +import org.jeecg.modules.productplan.enums.ProductPlanStatusEnum; +import org.jeecg.modules.productplan.service.IZyPlanProcessService; +import org.jeecg.modules.productplan.service.IZyProductPlanService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class ProductionLargeServiceImpl implements ProductionLargeService { + + @Autowired + private IHangRecordService iHangRecordService; + + @Autowired + private IZyPlanProcessService iZyPlanProcessService; + + @Autowired + private IZyProductPlanService iZyProductPlanService; + + @Override + public Map getData() { + + Map resultMap = new HashMap<>(); + + //1,吊挂 + // 分组统计，获取最新时间5条吊挂运行记录 + List recordList = iHangRecordService.list(new LambdaQueryWrapper().groupBy(HangRecord::getHangCode)); + Map diaoguaData = new HashMap<>(); + if (!ObjectUtils.isEmpty(recordList)) { + recordList.stream().forEach(e -> { + List records = iHangRecordService.list(new LambdaQueryWrapper() + .eq(HangRecord::getHangCode, e.getHangCode()) + .orderByDesc(HangRecord::getCreateTime) + .last("limit 5") + ); + diaoguaData.put(e.getHangCode(), records); + }); + } + resultMap.put("diaogua_data", diaoguaData); + + + //2,生产线实时状态 + // 统计生产计划状为生产中的数据 + List planList = iZyProductPlanService.list(new LambdaQueryWrapper().eq(ZyProductPlan::getStatus, ProductPlanStatusEnum.PRODUCTION.getCode())); + Map shengchanxianMap = new HashMap<>(); + if (!ObjectUtils.isEmpty(planList)) { + planList.stream().forEach(e -> { + List planProcessList = iZyPlanProcessService.list(new LambdaQueryWrapper().eq(ZyPlanProcess::getPlanId, e.getId())); + if (!ObjectUtils.isEmpty(planProcessList)) { + shengchanxianMap.put(e.getId(), planProcessList); + } + }); + } + resultMap.put("shengchanxian_data", shengchanxianMap); + + return resultMap; + } +}