嘉禾二期

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/InspectionTask.java

@@ -173,4 +173,7 @@ public class InspectionTask extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private List<String> groupIdList;
 
+    @TableField(exist = false)
+    private String groupName;
+
 }

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/InspectionTaskPoint.java

@@ -3,6 +3,8 @@ package org.springblade.lims.entry;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.NullSerializer;
 import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springframework.data.annotation.Id;
@@ -95,11 +97,13 @@ public class InspectionTaskPoint extends BaseEntity implements Serializable {
     /**
      * 位置经度
      */
+    @JsonSerialize(nullsUsing = NullSerializer.class)
     private Double pointPosLongitude;
 
     /**
      * 位置纬度
      */
+    @JsonSerialize(nullsUsing = NullSerializer.class)
     private Double pointPosLatitude;
 
     /**

lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/InstrumentData.java

@@ -26,6 +26,11 @@ public class InstrumentData extends BaseEntity implements Serializable {
      */
     private String imei;
 
+    /**
+     * 总用电
+     */
+    private Double totalElectricity;
+
     /**
      * 总有功功率
      */

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/ApplyDetailController.java

@@ -76,6 +76,10 @@ public class ApplyDetailController extends BladeController {
 //            wrapper.between(ApplyDetail::getCreateTime, apply.getStartTime(), apply.getEndTime());
 //        }
 //        wrapper.orderByDesc(ApplyDetail::getCreateTime);
+        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
+        if(!roles.contains("admin")){
+            apply.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
+        }
         List<ApplyDetail> details = applyDetailService.listOut(apply);
 
         List<ApplyDetailExcel> excels = new ArrayList<>();

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java

@@ -724,6 +724,10 @@ public class GoodsController extends BladeController {
     @GetMapping("/censusOut")
     public void censusOut(HttpServletResponse response, Goods goods) {
         LambdaQueryWrapper<Goods> wrapper = new LambdaQueryWrapper<>();
+        List<String> roles = Arrays.asList(AuthUtil.getUserRole().split(","));
+        if(!roles.contains("admin")){
+            wrapper.eq(BaseEntity::getCreateDept,AuthUtil.getDeptId());
+        }
         if (StringUtils.isNotBlank(goods.getName())) {
             wrapper.and(wq -> wq
                     .like(Goods::getName, goods.getName()).or()

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/mapper/AppleDetailMapper.xml

@@ -59,6 +59,9 @@
             <if test="apply.startTime != null and apply.endTime != null">
                 and b.create_time &gt;= #{apply.startTime} and b.create_time &lt;= #{apply.endTime}
             </if>
+            <if test="apply.createDept != null">
+                and a.create_dept = #{apply.createDept}
+            </if>
             and b.is_deleted = 0
             order by b.create_time desc
         </where>

lab-service/lab-capital/src/main/java/org/springblade/lims/goods/service/impl/GoodsServiceImpl.java

@@ -55,6 +55,7 @@ public class GoodsServiceImpl extends BaseServiceImpl<GoodsMapper, Goods> implem
             } catch (Exception e) {
                 e.printStackTrace();
             }
+            path = sysClient.getParamValue("jiahe_file_url").getData() + fileName;
         }
         map.put("filename",originalFilename);
         map.put("path",path);

lab-service/lab-lims/src/main/java/org/springblade/lims/job/CreateMaintainTaskJob.java

@@ -16,6 +16,6 @@ public class CreateMaintainTaskJob {
     @Scheduled(cron ="0 0/2 * * * ? ")
     public void createTask(){
         inspectionPlanService.checkAndCreateTask();
-        //maintainPlanService.checkAndCreateTask();
+        maintainPlanService.checkAndCreateTask();
     }
 }

lab-service/lab-lims/src/main/java/org/springblade/lims/mqtt/callback/MyMQTTCallback.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.commons.lang3.time.DateUtils;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallbackExtended;
+import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,7 +56,7 @@ public class MyMQTTCallback implements MqttCallbackExtended {
     @Override
     public void connectionLost(Throwable throwable) {
         log.error("mqtt connectionLost 连接断开，5S之后尝试重连: {}", throwable.getMessage());
-        /*long reconnectTimes = 1;
+        long reconnectTimes = 1;
         while (true) {
             if (MyMQTTClient.getClient().isConnected()) {
                 //判断已经重新连接成功  需要重新订阅主题 可以在这个if里面订阅主题  或者 connectComplete（方法里面）  看你们自己选择
@@ -76,7 +77,7 @@ public class MyMQTTCallback implements MqttCallbackExtended {
                 Thread.sleep(5000);
             } catch (InterruptedException e1) {
             }
-        }*/
+        }
     }
 
     /**
@@ -96,6 +97,9 @@ public class MyMQTTCallback implements MqttCallbackExtended {
             Map map1 = (Map) JSON.parse(map.get("vals").toString());
             data.setCreateTime(DateUtils.parseDate(map.get("tsstr").toString(),"yyyy-MM-dd hh:mm:ss"));
             data.setImei(map.get("imei").toString());
+            if(map1.containsKey("总用电")){
+                data.setTotalElectricity(Double.parseDouble(map1.get("总用电").toString()));
+            }
             if(map1.containsKey("总有功功率")){
                 data.setTotalActivePower(Double.parseDouble(map1.get("总有功功率").toString()));
             }

lab-service/lab-lims/src/main/java/org/springblade/lims/mqtt/config/MqttConfiguration.java

@@ -7,13 +7,14 @@ import org.slf4j.LoggerFactory;
 import org.springblade.lims.mqtt.client.MyMQTTClient;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 
 /**
  1. @author WXY
  2. @date 2022/6/29 20:42
  */
-//@Configuration
+@Configuration
 @DependsOn({"springUtil"})
 @Data
 public class MqttConfiguration {

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionPlanServiceImpl.java

@@ -268,6 +268,7 @@ public class InspectionPlanServiceImpl extends BaseServiceImpl<InspectionPlanMap
         task.setPlanStartTime(plan.getStartDate());
         task.setActStartTime(date);
         task.setTenantId(plan.getTenantId());
+        task.setCreateDept(plan.getCreateDept());
         inspectionTaskService.saveTask(task);
         //巡检点
         for(int j=0;j<pointList.size();j++){

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionPointServiceImpl.java

@@ -161,6 +161,7 @@ public class InspectionPointServiceImpl extends BaseServiceImpl<InspectionPointM
             } catch (Exception e) {
                 e.printStackTrace();
             }
+            path = sysClient.getParamValue("jiahe_file_url").getData() + fileName;
         }
         return path;
     }

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionTaskPointServiceImpl.java

@@ -138,6 +138,7 @@ public class InspectionTaskPointServiceImpl extends BaseServiceImpl<InspectionTa
             } catch (Exception e) {
                 e.printStackTrace();
             }
+            path = sysClient.getParamValue("jiahe_file_url").getData() + fileName;
         }
         return path;
     }

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/InspectionTaskServiceImpl.java

@@ -21,6 +21,7 @@ import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.lims.entry.*;
 import org.springblade.lims.mapper.InspectionTaskMapper;
 import org.springblade.lims.service.*;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,6 +44,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
     private final IInspectionPointService inspectionPointService;
     private final IInspectionRecordService inspectionRecordService;
     private final IInspectionTaskAbnormalService inspectionTaskAbnormalService;
+    private final ISysClient sysClient;
 
     @Override
     public IPage<InspectionTask> findPage(InspectionTask entry, Query query) {
@@ -119,6 +121,9 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
             entry.setCreateUser(AuthUtil.getUserId());
             entry.setCreateTime(date);
             entry.setOriginatorId(AuthUtil.getUserId().toString());
+            if(entry.getCreateDept() == null){
+                entry.setCreateDept(Long.parseLong(AuthUtil.getDeptId()));
+            }
             baseMapper.insert(entry);
         }else{
             entry.setUpdateUser(AuthUtil.getUserId());
@@ -129,8 +134,10 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
     }
 
     @Override
-    public InspectionTask findById(String id) {
-        InspectionTask entry = this.getById(id);
+    public InspectionTask findById(String id) {InspectionTask entry = this.getById(id);
+        if(StringUtils.isNotEmpty(entry.getGroupId())){
+            entry.setGroupName(sysClient.getDeptName(Long.parseLong(entry.getGroupId())).getData());
+        }
         //查询巡检点位
         List<InspectionTaskPoint> taskPointList = inspectionTaskPointService.list(new LambdaQueryWrapper<InspectionTaskPoint>().eq(InspectionTaskPoint::getTaskId,id));
         entry.setTaskPointList(taskPointList);
@@ -189,6 +196,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl<InspectionTaskMap
         task.setUpdateTime(new Date());
         task.setUpdateUser(AuthUtil.getUserId());
         task.setExecutorId(AuthUtil.getUserName());
+        task.setActFinishTime(new Date());
         this.updateById(task);
         //异常巡检点
         if(insertAbnormal){

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainPlanServiceImpl.java

@@ -227,6 +227,7 @@ public class MaintainPlanServiceImpl extends BaseServiceImpl<MaintainPlanMapper,
         task.setActStartTime(new Date());
         task.setTenantId(plan.getTenantId());
         task.setCreateDept(plan.getCreateDept());
+        task.setTotalCost(plan.getTotalCost());
         maintainTaskService.saveTask(task);
         //保养项目
         for(int j=0;j<projectList.size();j++){

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/MaintainProjectServiceImpl.java

@@ -110,6 +110,7 @@ public class MaintainProjectServiceImpl extends BaseServiceImpl<MaintainProjectM
             } catch (Exception e) {
                 e.printStackTrace();
             }
+            path = sysClient.getParamValue("jiahe_file_url").getData() + fileName;
         }
         map.put("filename",originalFilename);
         map.put("path",path);

lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/RepairApplicationServiceImpl.java

@@ -40,6 +40,7 @@ public class RepairApplicationServiceImpl extends BaseServiceImpl<RepairApplicat
             } catch (Exception e) {
                 e.printStackTrace();
             }
+            path = sysClient.getParamValue("jiahe_file_url").getData() + fileName;
         }
         return path;
     }