Merge branch 'master' of http://182.92.169.222:3000/yu/CostumingPlatform

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",

ant-design-vue-jeecg/src/components/procedure/processFabric.vue

@@ -6,7 +6,7 @@
       暂无数据!
     </div>
       <div style="padding: 20px 20px 0 20px;" v-for="(item,index) in tableModel" :key="index" v-else>
-       <p style="font-size: 16px;margin-bottom: 0">辅料{{index+1}}信息</p>
+       <p style="font-size: 16px;margin-bottom: 0">辅料信息</p>
         <el-descriptions class="margin-top" :column="3" border style="margin: 20px 0">
           <el-descriptions-item>
             <template slot="label"><i class="el-icon-receiving"></i>类型id</template>
@@ -22,7 +22,7 @@
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"><i class="el-icon-copy-document"></i>图片</template>
-            {{item.picture}}
+            <img v-if="item.picture" :src="item.picture"><span v-if="!item.picture">暂无图片</span>
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"><i class="el-icon-price-tag"></i>材质</template>
@@ -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 = [

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() {

ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue

@@ -300,4 +300,7 @@ export default {
 </script>
 <style scoped>
 @import '~@assets/less/common.less';
+/deep/ .ant-table-fixed   .ant-table-tbody .ant-table-row.ant-table-row-level-0{
+  height: 46px!important;
+}
 </style>

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");

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<ZyAccessories, IZyA
 	@GetMapping(value = "/queryById")
 	public Result<?> 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("未找到对应数据");
 		}

jeecg-boot/jeecg-boot-module-system/pom.xml

@@ -135,11 +135,11 @@
             <version>5.2.4.RELEASE</version>
         </dependency>
 		<!-- 引入定时任务依赖 -->
-		<dependency>
+	<!--	<dependency>
 			<groupId>org.jeecgframework.boot</groupId>
 			<artifactId>jeecg-boot-starter-job</artifactId>
 		</dependency>
-
+-->
 		<!-- https://mvnrepository.com/artifact/com.jacob/jacob 语音合成 -->
 		<dependency>
 			<groupId>com.hynnet</groupId>

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;

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<String, Object> data = productionLargeService.getData();
+        return Result.OK(data);
+    }
+
+}

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<String, Object> getData();
+}

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<String, Object> getData() {
+
+        Map<String, Object> resultMap = new HashMap<>();
+
+        //1,吊挂
+        // 分组统计，获取最新时间5条吊挂运行记录
+        List<HangRecord> recordList = iHangRecordService.list(new LambdaQueryWrapper<HangRecord>().groupBy(HangRecord::getHangCode));
+        Map<String, Object> diaoguaData = new HashMap<>();
+        if (!ObjectUtils.isEmpty(recordList)) {
+            recordList.stream().forEach(e -> {
+                List<HangRecord> records = iHangRecordService.list(new LambdaQueryWrapper<HangRecord>()
+                        .eq(HangRecord::getHangCode, e.getHangCode())
+                        .orderByDesc(HangRecord::getCreateTime)
+                        .last("limit 5")
+                );
+                diaoguaData.put(e.getHangCode(), records);
+            });
+        }
+        resultMap.put("diaogua_data", diaoguaData);
+
+
+        //2,生产线实时状态
+        // 统计生产计划状为生产中的数据
+        List<ZyProductPlan> planList = iZyProductPlanService.list(new LambdaQueryWrapper<ZyProductPlan>().eq(ZyProductPlan::getStatus, ProductPlanStatusEnum.PRODUCTION.getCode()));
+        Map<String, Object> shengchanxianMap = new HashMap<>();
+        if (!ObjectUtils.isEmpty(planList)) {
+            planList.stream().forEach(e -> {
+                List<ZyPlanProcess> planProcessList = iZyPlanProcessService.list(new LambdaQueryWrapper<ZyPlanProcess>().eq(ZyPlanProcess::getPlanId, e.getId()));
+                if (!ObjectUtils.isEmpty(planProcessList)) {
+                    shengchanxianMap.put(e.getId(), planProcessList);
+                }
+            });
+        }
+        resultMap.put("shengchanxian_data", shengchanxianMap);
+
+        return resultMap;
+    }
+}