Merge branch 'dev' of depot-qinghai/depot-intelligent-qinghai into master

pom.xml

@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.0.RELEASE</version>
+        <version>2.3.12.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -23,7 +23,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
+        <spring-cloud.version>Hoxton.SR12</spring-cloud.version>
         <skipTests>true</skipTests>
     </properties>
 
@@ -47,6 +47,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
+            <version>3.2.4</version>
+        </dependency>
+        <!--<dependency>
+            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>3.1.6</version>
         </dependency>
@@ -54,12 +59,19 @@
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>3.1.6</version>
-        </dependency>
+        </dependency>-->
         <!--添加webservice end-->
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>1.3.1</version>
+            <version>2.1.4</version>
+        </dependency>
+        <!-- MyBatis-Plus(对应spring boot 2.0.x) -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.1</version>
+            <!--<version>2.3.3</version>-->
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -85,12 +97,12 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
-            <version>2.6.1</version>
+            <version>2.9.2</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.6.1</version>
+            <version>2.9.2</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -134,15 +146,12 @@
             <artifactId>quartz</artifactId>
             <version>2.3.0</version>
         </dependency>
-
-        
         <!--短信发送平台jar包-->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
@@ -151,10 +160,6 @@
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session-data-redis</artifactId>
         </dependency>
-        <dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-		</dependency>
     </dependencies>
 
     <dependencyManagement>

src/main/java/com/DepotIntelligentApplication.java

@@ -14,7 +14,6 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
 import org.springframework.web.servlet.DispatcherServlet;
 
 @EnableEurekaClient
-@EnableDiscoveryClient
 @ServletComponentScan
 @SpringBootApplication(exclude = PageHelperAutoConfiguration.class)//配置mybatis的配置文件使用，否则报多个分页插件
 @MapperScan(basePackages = {"com.chinaitop.depot.**.mapper"})
@@ -27,7 +26,7 @@ public class DepotIntelligentApplication {
 	/**
 	 * 注册一个dispatcherServlet,解决增加ws之后https接口访问不了问题
 	 */
-	@Bean
+	/*@Bean
 	public ServletRegistrationBean restServlet(){
 		//注解扫描上下文
 		AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext();
@@ -43,7 +42,7 @@ public class DepotIntelligentApplication {
 		//指定name，如果不指定默认为dispatcherServlet
 		registrationBean.setName("rest");
 		return registrationBean;
-	}
+	}*/
 
 	@Bean
 	public ThreadPoolTaskScheduler threadPoolTaskScheduler() {

src/main/java/com/chinaitop/depot/intelligent/common/PageParam.java

@@ -0,0 +1,24 @@
+package com.chinaitop.depot.intelligent.common;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author qingsong.han
+ * @description: 分页基础类,可被继承
+ * @create 2024-05-09 14:54
+ */
+@Data
+public class PageParam implements Serializable {
+    private static final long serialVersionUID = 1756985404049965037L;
+    /** 当前页 */
+    @ApiModelProperty(value = "当前页码")
+    private Integer current;
+
+    /** 每页条数 */
+    @ApiModelProperty(value = "每页条数")
+    private Integer size;
+
+}

src/main/java/com/chinaitop/depot/intelligent/devControl/controller/TDevControlController.java

@@ -0,0 +1,62 @@
+package com.chinaitop.depot.intelligent.devControl.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaitop.depot.intelligent.devControl.model.TDevControl;
+import com.chinaitop.depot.intelligent.devControl.model.TDevControlPageParam;
+import com.chinaitop.depot.intelligent.devControl.service.TDevControlService;
+import com.unissoft.model.ResponseEntity;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.ws.rs.GET;
+
+
+/**
+ * <p>
+ * 设备控制 前端控制器
+ * </p>
+ *
+ * @author root
+ * @since 2024-05-09
+ */
+@RestController
+@RequestMapping("/t-dev-control")
+@Api(tags = "设备配置")
+public class TDevControlController {
+    @Resource
+    private TDevControlService devControlService;
+
+    @GetMapping("/getPageList")
+    @ApiOperation(value = "设备配置分页列表", notes = "支持分页")
+    public ResponseEntity<Page<TDevControl>> getPageList(@Validated TDevControlPageParam devControl) {
+        return ResponseEntity.ok(devControlService.selectPageList(devControl));
+    }
+
+    @PostMapping("/save")
+    @ApiOperation(value = "设备配置新增", notes = "新增")
+    public ResponseEntity save(@RequestBody TDevControl devControl) {
+        return ResponseEntity.ok(devControlService.saveData(devControl));
+    }
+
+    @PutMapping("/update")
+    @ApiOperation(value = "设备配置修改", notes = "修改")
+    public ResponseEntity update(@RequestBody TDevControl devControl) {
+        return ResponseEntity.ok(devControlService.updateData(devControl));
+    }
+
+    @DeleteMapping("/delete/{id}")
+    @ApiOperation(value = "设备配置删除", notes = "id删除")
+    public ResponseEntity delete(@PathVariable("id") String id) {
+        return ResponseEntity.ok(devControlService.deleteData(id));
+    }
+
+    @GetMapping("/getById/{id}")
+    @ApiOperation(value = "设备配置详情", notes = "id获取详情")
+    public ResponseEntity<TDevControl> getById(@PathVariable("id") String id) {
+        return ResponseEntity.ok(devControlService.getById(id));
+    }
+
+}

src/main/java/com/chinaitop/depot/intelligent/devControl/mapper/TDevControlMapper.java

@@ -0,0 +1,16 @@
+package com.chinaitop.depot.intelligent.devControl.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.chinaitop.depot.intelligent.devControl.model.TDevControl;
+
+/**
+ * <p>
+ * 设备控制 Mapper 接口
+ * </p>
+ *
+ * @author root
+ * @since 2024-05-09
+ */
+public interface TDevControlMapper extends BaseMapper<TDevControl> {
+
+}

src/main/java/com/chinaitop/depot/intelligent/devControl/mapper/TDevControlMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chinaitop.depot.intelligent.devControl.mapper.TDevControlMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.devControl.model.TDevControl">
+        <id column="id" property="id" />
+        <result column="company_code" property="companyCode" />
+        <result column="company_name" property="companyName" />
+        <result column="org_id" property="orgId" />
+        <result column="org_name" property="orgName" />
+        <result column="dev_code" property="devCode" />
+        <result column="dev_name" property="devName" />
+        <result column="ggxh" property="ggxh" />
+        <result column="sccj" property="sccj" />
+        <result column="scrq" property="scrq" />
+        <result column="sbms" property="sbms" />
+        <result column="sbzt" property="sbzt" />
+        <result column="jdsj" property="jdsj" />
+        <result column="rkrq" property="rkrq" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, company_code, company_name, org_id, org_name, dev_code, dev_name, ggxh, sccj, scrq, sbms, sbzt, jdsj, rkrq
+    </sql>
+
+</mapper>

src/main/java/com/chinaitop/depot/intelligent/devControl/model/TDevControl.java

@@ -0,0 +1,88 @@
+package com.chinaitop.depot.intelligent.devControl.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 设备控制
+ * </p>
+ *
+ * @author root
+ * @since 2024-05-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_dev_control")
+@ApiModel(value="TDevControl对象", description="设备控制")
+public class TDevControl implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键32位id")
+    @TableId(value = "id", type = IdType.INPUT)
+    private String id;
+
+    @ApiModelProperty(value = "企业编码")
+    @TableField("company_code")
+    private String companyCode;
+
+    @ApiModelProperty(value = "企业名称")
+    @TableField("company_name")
+    private String companyName;
+
+    @ApiModelProperty(value = "库区编码")
+    @TableField("org_id")
+    private String orgId;
+
+    @ApiModelProperty(value = "库区名称")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "设备编号")
+    @TableField("dev_code")
+    private String devCode;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("dev_name")
+    private String devName;
+
+    @ApiModelProperty(value = "规格型号")
+    @TableField("ggxh")
+    private String ggxh;
+
+    @ApiModelProperty(value = "生产厂家")
+    @TableField("sccj")
+    private String sccj;
+
+    @ApiModelProperty(value = "生产日期")
+    @TableField("scrq")
+    private Date scrq;
+
+    @ApiModelProperty(value = "设备描述")
+    @TableField("sbms")
+    private String sbms;
+
+    @ApiModelProperty(value = "设备状态")
+    @TableField("sbzt")
+    private String sbzt;
+
+    @ApiModelProperty(value = "检定时间")
+    @TableField("jdsj")
+    private Date jdsj;
+
+    @ApiModelProperty(value = "入库日期")
+    @TableField("rkrq")
+    private Date rkrq;
+
+
+}

src/main/java/com/chinaitop/depot/intelligent/devControl/model/TDevControlPageParam.java

@@ -0,0 +1,30 @@
+package com.chinaitop.depot.intelligent.devControl.model;
+
+import com.chinaitop.depot.intelligent.common.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author qingsong.han
+ * @description: 设备控制分页条件继承类
+ * @create 2024-05-09 14:59
+ */
+@Getter
+@Setter
+public class TDevControlPageParam extends PageParam {
+    private static final long serialVersionUID = -2516405395946226127L;
+
+    @ApiModelProperty(value = "企业名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "设备名称")
+    private String devName;
+
+    @ApiModelProperty(value = "库区编码")
+    @NotBlank
+    private String orgId;
+}

src/main/java/com/chinaitop/depot/intelligent/devControl/service/TDevControlService.java

@@ -0,0 +1,25 @@
+package com.chinaitop.depot.intelligent.devControl.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.chinaitop.depot.intelligent.devControl.model.TDevControl;
+import com.chinaitop.depot.intelligent.devControl.model.TDevControlPageParam;
+
+/**
+ * <p>
+ * 设备控制 服务类
+ * </p>
+ *
+ * @author root
+ * @since 2024-05-09
+ */
+public interface TDevControlService extends IService<TDevControl> {
+
+    Page<TDevControl> selectPageList(TDevControlPageParam devControl);
+
+    int saveData(TDevControl devControl);
+
+    int updateData(TDevControl devControl);
+
+    int deleteData(String id);
+}

src/main/java/com/chinaitop/depot/intelligent/devControl/service/impl/TDevControlServiceImpl.java

@@ -0,0 +1,60 @@
+package com.chinaitop.depot.intelligent.devControl.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.chinaitop.depot.intelligent.devControl.mapper.TDevControlMapper;
+import com.chinaitop.depot.intelligent.devControl.model.TDevControl;
+import com.chinaitop.depot.intelligent.devControl.model.TDevControlPageParam;
+import com.chinaitop.depot.intelligent.devControl.service.TDevControlService;
+import com.chinaitop.depot.intelligent.utils.UuidUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 设备控制 服务实现类
+ * </p>
+ *
+ * @author root
+ * @since 2024-05-09
+ */
+@Service
+public class TDevControlServiceImpl extends ServiceImpl<TDevControlMapper, TDevControl> implements TDevControlService {
+    @Resource
+    private TDevControlMapper devControlMapper;
+
+    @Override
+    public Page<TDevControl> selectPageList(TDevControlPageParam devControl) {
+        QueryWrapper<TDevControl> wrapper = new QueryWrapper<>();
+        wrapper.eq("org_id", devControl.getOrgId());
+        if (StringUtils.isNotEmpty(devControl.getCompanyName()))
+            wrapper.like("company_name", devControl.getCompanyName());
+        if (StringUtils.isNotEmpty(devControl.getDevName()))
+            wrapper.like("dev_name", devControl.getDevName());
+        return devControlMapper.selectPage(new Page<>(devControl.getCurrent(), devControl.getSize()), wrapper);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int saveData(TDevControl devControl) {
+        // 生成32id
+        devControl.setId(UuidUtils.getCode());
+        return devControlMapper.insert(devControl);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateData(TDevControl devControl) {
+        return devControlMapper.updateById(devControl);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteData(String id) {
+        return devControlMapper.deleteById(id);
+    }
+}

src/main/java/com/chinaitop/depot/intelligent/grainsituation/model/TTestdata.java

@@ -274,16 +274,16 @@ public class TTestdata {
     }
 
     /**
-     * 0�����飻1�����飻2��ˮ��
-     * @return iLq_yq 0�����飻1�����飻2��ˮ��
+     * 0：粮情；1：油情；2：水分
+     * @return iLq_yq 0：粮情；1：油情；2：水分
      */
     public String getIlqYq() {
         return ilqYq;
     }
 
     /**
-     * 0�����飻1�����飻2��ˮ��
-     * @param ilqYq 0�����飻1�����飻2��ˮ��
+     * 0：粮情；1：油情；2：水分
+     * @param ilqYq 0：粮情；1：油情；2：水分
      */
     public void setIlqYq(String ilqYq) {
         this.ilqYq = ilqYq == null ? null : ilqYq.trim();
@@ -292,6 +292,7 @@ public class TTestdata {
     /**
      *
      * @return t_points
+     * temp:温度值 单位：摄氏度；坏点值以250表示；精确到小数点后1位;测温点在仓内的X坐标代表长度 代表列;测温点在仓内的Y坐标宽度方向 代表行;测温点在仓内的Z坐标高度
      */
     public String gettPoints() {
         return tPoints;
@@ -300,6 +301,7 @@ public class TTestdata {
     /**
      *
      * @param tPoints
+     * temp:温度值 单位：摄氏度；坏点值以250表示；精确到小数点后1位;测温点在仓内的X坐标代表长度 代表列;测温点在仓内的Y坐标宽度方向 代表行;测温点在仓内的Z坐标高度
      */
     public void settPoints(String tPoints) {
         this.tPoints = tPoints == null ? null : tPoints.trim();

src/main/java/com/unissoft/serviceconfig/CxfConfig.java

@@ -14,10 +14,10 @@ import javax.xml.ws.Endpoint;
 
 @Configuration
 public class CxfConfig {
-    @Bean
+    /*@Bean
     public ServletRegistrationBean dispatcherServlet() {
         return new ServletRegistrationBean(new CXFServlet(),"/intelligent/*");
-    }
+    }*/
     @Bean(name = Bus.DEFAULT_BUS_ID)
     public SpringBus springBus() {
         return new SpringBus();

src/main/resources/bootstrap-dev.yml

@@ -12,7 +12,7 @@ num_version3: :20013
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:9001/eureka/
+      defaultZone: http://172.16.0.46:9001/eureka/
   instance:
     hostname: 172.16.0.46
     prefer-ip-address: true
@@ -24,7 +24,7 @@ eureka:
 spring:
   # 数据库配置
   datasource:
-    driver-class-name: com.mysql.jdbc.Driver
+    driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://172.16.0.36:3306/depot_qh?useUnicode=true&characterEncoding=utf-8&useSSL=false
     username: root
     password: admin@1234
@@ -44,4 +44,6 @@ spring:
         max-idle: 8
         min-idle: 0
 web:
-  upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
+  upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
+cxf:
+  path: /intelligent

src/main/resources/bootstrap-prod.yml

@@ -44,4 +44,6 @@ spring:
         max-idle: 8
         min-idle: 0
 web:
-  upload-path: /home/qh/depot/depotImg
+  upload-path: /home/qh/depot/depotImg
+cxf:
+  path: /intelligent