【修改】 依赖报错处理

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/AlarmRecordController.java

@@ -13,6 +13,7 @@ import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.utils.TransferUtils;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.R;
+import com.zd.model.entity.InventoryTag;
 import com.zd.model.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/IAlarmRecordService.java

@@ -3,6 +3,7 @@ package com.zd.airbottle.service;
 import com.zd.airbottle.domain.AlarmRecord;
 import com.zd.airbottle.domain.vo.AlarmRecordVo;
 import com.zd.airbottle.domain.vo.BottleStorageInfoVo;
+import com.zd.model.entity.InventoryTag;
 import com.zd.model.entity.RemoteLabHardware;
 
 import java.util.List;

zd-modules/zd-algorithm/pom.xml

@@ -37,32 +37,6 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
-        <!-- zd Common DataSource -->
-        <!--<dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-datasource</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.alibaba.cloud</groupId>
-                    <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        &lt;!&ndash; zd Common Log &ndash;&gt;
-        <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-log</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-datascope</artifactId>
-        </dependency>-->
-        <!--<dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-mqtt</artifactId>
-        </dependency>-->
-
         <!--mqtt客户端链接服务-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -184,7 +158,6 @@
             <groupId>com.zd.mqtt</groupId>
             <artifactId>common-mqtt</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>

zd-modules/zd-algorithm/src/main/java/com/zd/alg/AlgorithmApplication.java

@@ -5,7 +5,9 @@ import com.zd.alg.forward.config.AlgorithmYml;
 import com.zd.alg.forward.properties.FireProperties;
 import com.zd.common.core.annotation.EnableCustomConfig;
 import com.zd.common.core.annotation.EnableRyFeignClients;
+import com.zd.common.core.launch.ZdStartApplication;
 import com.zd.common.mqtt.model.MqttProperties;
+import com.zd.model.constant.ApplicationConstants;
 import com.zd.model.constant.Constants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
@@ -28,8 +30,7 @@ public class AlgorithmApplication {
     private static ConfigurableApplicationContext context;
     public static void main(String[] args) {
         AlgorithmApplication.args=args;
-        //context = SpringApplication.run(AlgorithmApplication.class, args);
-        context = SpringApplication.run(AlgorithmApplication.class, args);
+        context = ZdStartApplication.run(ApplicationConstants.ALGORITHM_SERVICE, AlgorithmApplication.class, args);
     }
 
     // 项目重启

zd-modules/zd-base/src/main/java/com/zd/base/message/base/FridConsumer.java

@@ -21,7 +21,7 @@ public class FridConsumer implements Consumer<InventoryTag> {
     public void accept(InventoryTag tag) {
         try {
             tag.setEpc(tag.getEpc().replace(" ", ""));
-            com.zd.laboratory.api.vo.InventoryTag inventoryTag = new com.zd.laboratory.api.vo.InventoryTag();
+            com.zd.model.entity.InventoryTag inventoryTag = new com.zd.model.entity.InventoryTag();
             BeanUtils.copyProperties(tag,inventoryTag);
             sendService.send(inventoryTag);
         } catch (BeansException e) {

zd-modules/zd-base/src/main/java/com/zd/base/message/service/ISendService.java

@@ -1,6 +1,8 @@
 package com.zd.base.message.service;
 
 
+import com.zd.model.entity.InventoryTag;
+
 public interface ISendService {
 
     /**

zd-modules/zd-base/src/main/java/com/zd/base/message/service/impl/SendServiceImpl.java

@@ -2,6 +2,7 @@ package com.zd.base.message.service.impl;
 
 
 import com.zd.base.message.service.ISendService;
+import com.zd.model.entity.InventoryTag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpSmartTerminalConfigServiceImpl.java

@@ -17,6 +17,7 @@ import com.zd.chemical.service.IHxpSmartTerminalConfigService;
  */
 @Service
 public class HxpSmartTerminalConfigServiceImpl implements IHxpSmartTerminalConfigService {
+
     @Autowired
     private HxpSmartTerminalConfigMapper hxpSmartTerminalConfigMapper;
 

zd-modules/zd-chemical/src/main/java/com/zd/chemical/util/SmsSydUtil.java

@@ -14,9 +14,7 @@ import com.zd.common.core.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-
 import javax.validation.constraints.NotNull;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -139,7 +137,6 @@ public class SmsSydUtil {
         }
     }
 
-
     /**
      * 获取上行信息
      *
@@ -177,12 +174,9 @@ public class SmsSydUtil {
                     }
                 }
             }
-
             if(mosList.size() > 0){
                 log.info("四医大短信上行查询遗漏数据：" + JSONUtil.toJsonStr(mosList));
             }
-
         }
     }
-
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabGradeManageRecordDetailMapper.java

@@ -1,8 +1,6 @@
 package com.zd.laboratory.mapper;
 
-
 import com.zd.laboratory.api.entity.LabGradeManageRecordDetail;
-
 import java.util.List;
 
 /**

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabBigViewMapper.xml

@@ -3,10 +3,6 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.LabHardwareStateMapper">
-
-
-
-
 <!--   设备状态 -->
     <select id="queryHardwareState"  resultType="com.zd.laboratory.domain.bigview.HardwareState">
         select  type as hardware_type,operate as hardware_operate  ,count(id) as total  from  lab_hardware
@@ -122,7 +118,7 @@
     </select>
 
 
-    <select id="querySubOnlineUser" resultType="com.zd.system.api.domain.SysUser">
+    <select id="querySubOnlineUser" resultType="com.zd.model.entity.SysUser">
         select u.user_name as userName, u.nick_name as nickName,
                 u.major, u.phonenumber, d.dept_name as deptName
         from (
@@ -139,7 +135,7 @@
             left join sys_dept d on u.dept_id = d.dept_id
     </select>
 
-    <select id="querySubOnlineUserByOnepc" resultType="com.zd.system.api.domain.SysUser">
+    <select id="querySubOnlineUserByOnepc" resultType="com.zd.model.entity.SysUser">
 
         SELECT u.user_name AS userName, u.nick_name AS nickName,
         u.major, u.phonenumber, d.dept_name AS deptName, su.createTime, u.`avatar`

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabGradeManageMapper.xml

@@ -25,7 +25,7 @@
         <result property="name" column="name"/>
     </resultMap>
 
-    <resultMap id="manageWorkVoMap" type="com.zd.system.api.laboratory.domain.vo.LabGradeManageWorkVO">
+    <resultMap id="manageWorkVoMap" type="com.zd.laboratory.api.vo.LabGradeManageWorkVO">
         <result property="subId" column="subId"/>
         <result property="subName" column="subName"/>
         <result property="level" column="level"/>
@@ -42,7 +42,7 @@
 
     </resultMap>
 
-    <resultMap id="manageIdMap" type="com.zd.system.api.laboratory.domain.vo.LabGradeManageWorkVO$ManageId">
+    <resultMap id="manageIdMap" type="com.zd.laboratory.api.vo.LabGradeManageWorkVO$ManageId">
         <result property="manageId" column="manageId"/>
     </resultMap>
 

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabGradeManageRecordDetailMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.LabGradeManageRecordDetailMapper">
 
-    <resultMap type="com.zd.system.api.laboratory.domain.LabGradeManageRecordDetail" id="LabGradeManageRecordDetailResult">
+    <resultMap type="com.zd.laboratory.api.entity.LabGradeManageRecordDetail" id="LabGradeManageRecordDetailResult">
         <result property="id" column="id"/>
         <result property="deptId" column="dept_id"/>
         <result property="deptName" column="dept_name"/>
@@ -53,7 +53,7 @@
         from lab_grade_manage_record_detail as t
     </sql>
     <select id="selectLabGradeManageRecordDetailList"
-            parameterType="com.zd.system.api.laboratory.domain.LabGradeManageRecordDetail"
+            parameterType="com.zd.laboratory.api.entity.LabGradeManageRecordDetail"
             resultMap="LabGradeManageRecordDetailResult">
         <include refid="selectLabGradeManageRecordDetailVo"/>
         <where>
@@ -75,7 +75,7 @@
         limit 1
     </select>
 
-    <insert id="insertLabGradeManageRecordDetail" parameterType="com.zd.system.api.laboratory.domain.LabGradeManageRecordDetail"
+    <insert id="insertLabGradeManageRecordDetail" parameterType="com.zd.laboratory.api.entity.LabGradeManageRecordDetail"
             useGeneratedKeys="true" keyProperty="id">
         insert into lab_grade_manage_record_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -120,7 +120,7 @@
         </trim>
     </insert>
 
-    <update id="updateLabGradeManageRecordDetail" parameterType="com.zd.system.api.laboratory.domain.LabGradeManageRecordDetail">
+    <update id="updateLabGradeManageRecordDetail" parameterType="com.zd.laboratory.api.entity.LabGradeManageRecordDetail">
         update lab_grade_manage_record_detail
         <trim prefix="SET" suffixOverrides=",">
             <if test="deptId != null">dept_id = #{deptId},</if>

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/LabGradeManageRecordMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zd.laboratory.mapper.LabGradeManageRecordMapper">
 
-    <resultMap type="com.zd.system.api.laboratory.domain.LabGradeManageRecord" id="LabGradeManageRecordResult">
+    <resultMap type="com.zd.laboratory.api.entity.LabGradeManageRecord" id="LabGradeManageRecordResult">
         <result property="id" column="id"/>
         <result property="deptId" column="dept_id"/>
         <result property="deptName" column="dept_name"/>
@@ -93,7 +93,7 @@
             left join sys_user u on t.join_user_id = u.user_id
             left join sys_post p on p.post_id = u.position
     </sql>
-    <select id="selectLabGradeManageRecordList" parameterType="com.zd.system.api.laboratory.domain.LabGradeManageRecord"
+    <select id="selectLabGradeManageRecordList" parameterType="com.zd.laboratory.api.entity.LabGradeManageRecord"
             resultMap="LabGradeManageRecordResult">
         <include refid="selectLabGradeManageRecordListVo"/>
         <where>
@@ -137,7 +137,7 @@
         where t.id = #{id}
     </select>
 
-    <select id="selectByRuleIds" resultType="com.zd.system.api.laboratory.domain.LabGradeManageRecord">
+    <select id="selectByRuleIds" resultType="com.zd.laboratory.api.entity.LabGradeManageRecord">
         <include refid="selectLabGradeManageRecordVo"/>
         where rule_id in
         <foreach item="ruleId" collection="list" open="(" separator="," close=")">
@@ -145,12 +145,12 @@
         </foreach>
     </select>
 
-    <select id="selectExpired" resultType="com.zd.system.api.laboratory.domain.LabGradeManageRecord">
+    <select id="selectExpired" resultType="com.zd.laboratory.api.entity.LabGradeManageRecord">
         <include refid="selectLabGradeManageRecordVo"/>
         where status = 0
     </select>
 
-    <select id="selectExpiredByUserId" resultType="com.zd.system.api.laboratory.domain.vo.LabGradeManageWorkDetailVO">
+    <select id="selectExpiredByUserId" resultType="com.zd.laboratory.api.vo.LabGradeManageWorkDetailVO">
         select
            re.id as recordId, re.sub_id, re.rule_id, re. rule_name, re.join_user_id, re.rule_user_id,
            ifnull(r.remark, "") as ruleRemark, re.status, re.carry_time, ru.is_upload, re.end_date, re.cycle_count,
@@ -436,7 +436,7 @@
         </if>
     </select>
 
-    <insert id="insertLabGradeManageRecord" parameterType="com.zd.system.api.laboratory.domain.LabGradeManageRecord"
+    <insert id="insertLabGradeManageRecord" parameterType="com.zd.laboratory.api.entity.LabGradeManageRecord"
             useGeneratedKeys="true" keyProperty="id">
         insert into lab_grade_manage_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -514,7 +514,7 @@
         </foreach>
     </insert>
 
-    <update id="updateLabGradeManageRecord" parameterType="com.zd.system.api.laboratory.domain.LabGradeManageRecord">
+    <update id="updateLabGradeManageRecord" parameterType="com.zd.laboratory.api.entity.LabGradeManageRecord">
         update lab_grade_manage_record
         <trim prefix="SET" suffixOverrides=",">
             <if test="deptId != null">dept_id = #{deptId},</if>