人案关联模型提交(湖南)

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/RyAndAjEntity/AJAndRyResullt.java

 package com.founder.commonutils.model.newPublicEntity.RyAndAjEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -10,23 +12,23 @@ import java.util.Set;
  * 案关联人员接口返回格式
  */
 @Data
+@ApiModel(value = "案关联人员接口返回格式", description = "")
 public class AJAndRyResullt implements Serializable {
 
-    /**
-     * 人员信息
-     */
+
+    @ApiModelProperty(value = "人员信息")
     private List<TbStXftpNew> tbStXftpNew;
-    /**
-     *案件信息
-     */
+
+
+    @ApiModelProperty(value = "案件信息")
     private List<TbStJzyp> tbStJzyps;
-    /**
-     * 户籍地（去重后）
-     */
+
+
+    @ApiModelProperty(value = "户籍地（去重后）")
     private List hjdzd;
-    /**
-     * 犯罪状态（去重后）
-     */
+
+
+    @ApiModelProperty(value = "罪状态（去重后）")
     private Set fzbq;
 
 

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/RyAndAjEntity/BqXqByZjhmResult.java

 package com.founder.commonutils.model.newPublicEntity.RyAndAjEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 @Data
+@ApiModel(value = "标签数据透视接口返回格式", description = "")
 public class BqXqByZjhmResult implements Serializable {
 
-    /**
-     * 标签
-     */
+    @ApiModelProperty(value = "标签")
     private String fzbq;
-    /**
-     *标识号（asjbh）
-     */
+
+    @ApiModelProperty(value = "标识号（asjbh）")
     private String bsh;
-    /**
-     *创建时间
-     */
+
+    @ApiModelProperty(value = "创建时间")
     private Date cjsj;
-    /**
-     *创建单位
-     */
+
+    @ApiModelProperty(value = "创建单位")
     private String cjdw;
-    /**
-     *简要情况
-     */
+
+    @ApiModelProperty(value = "简要情况")
     private String jyqk;
-    /**
-     *数据来源
-     */
+
+    @ApiModelProperty(value = "数据来源")
     private String sjly;
 }

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/RyAndAjEntity/Resultjson.java

 package com.founder.commonutils.model.newPublicEntity.RyAndAjEntity;
 
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
+@ApiModel(value = "可视化返回结果", description = "")
 public class Resultjson {
 
     private kshdata kshdata;

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/RyAndAjEntity/TbStJzyp.java

@@ -73,16 +73,22 @@ public class TbStJzyp implements Serializable {
     /**
      * 经纬度
      */
+    @ApiModelProperty(value = "经度")
     @TableField(exist = false)
     private Double dqjd;
+    @ApiModelProperty(value = "纬度")
     @TableField(exist = false)
     private Double dqwd;
+    @ApiModelProperty(value = "案事件发生地点_地址名称")
     @TableField(exist = false)
     private String asjfsddDzmc;
+    @ApiModelProperty(value = "开始时间")
     @TableField(exist = false)
     private Date asjfskssj;
+    @ApiModelProperty(value = "结束时间")
     @TableField(exist = false)
     private Date asjfsjssj;
+    @ApiModelProperty(value = "简要案情")
     @TableField(exist = false)
     private String jyaq;
 

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/RyAndAjEntity/TbYwXszDwcbgx.java

@@ -3,6 +3,7 @@ package com.founder.commonutils.model.newPublicEntity.RyAndAjEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -13,21 +14,26 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("tb_yw_xsz_dwcbgx")
-@ApiModel(value="tb_yw_xsz_dwcbgx", description="")
+@ApiModel(value="多维串并关系实体", description="")
 public class TbYwXszDwcbgx implements Serializable {
 
+    @ApiModelProperty("信息主键编号")
     @TableField("XXZJBH")
     private String XXZJBH;
 
+    @ApiModelProperty("线索组案件编号")
     @TableField("XSZAJBH")
     private String XSZAJBH;
 
+    @ApiModelProperty("案件编号")
     @TableField("ASJBH")
     private String ASJBH;
 
+    @ApiModelProperty("人员信息")
     @TableField("RYXX")
     private String RYXX;
 
+    @ApiModelProperty("物证信息")
     @TableField("WZXX")
     private String WZXX;
 

common/common_utils/src/main/java/com/founder/commonutils/model/newPublicEntity/RyAndAjEntity/WffzListResult.java

 package com.founder.commonutils.model.newPublicEntity.RyAndAjEntity;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
 @Data
+@ApiModel(value="数据透视list返回", description="")
 public class WffzListResult implements Serializable {
 /*        入参证件号码
         查询tb_st_xftp_new  、tb_st_asj  两表asjbh关联   返回  案件编号、案发开始时间、
         案件类别(AJLBDM  代码通过sys_dictitem  groupid='CODE_AJLB'  翻译拿到name)、
         案发地名称(asjfsdd_xzqhdm  代码通过sys_dictitem  groupid='CODE_XZQH'  翻译拿到name)   根据案发开始时间倒叙*/
-    /**
-     * 案件编号
-     */
 
+    @ApiModelProperty("案件编号")
     private String asjbh;
-    /**
-     * 案发开始时间
-     */
+
+    @ApiModelProperty("案发开始时间")
     private Date afkksj;
-    /**
-     * 案件类别
-     */
+
+    @ApiModelProperty("案件类别")
     private String ajlb;
-    /**
-     * 案发地名称
-     */
+
+    @ApiModelProperty("案发地名称")
     private String afdmc;
-    /**
-     * 案件名称
-     */
+
+    @ApiModelProperty("案件名称")
     private String ajmc;
 
 }

common/service_base/src/main/java/com/founder/servicebase/logs/SysLogAspect.java

@@ -146,13 +146,13 @@ public class SysLogAspect {
                     sysLog.setLx("1");
                     String key = "userIdleTime:" + token.getIdentitycard();
                     System.out.println("userIdleTime:key=="+key+"&&value=="+redisTemplate.opsForValue().get(key));
-                    if (!redisTemplate.hasKey(key)){
+                   /* if (!redisTemplate.hasKey(key)){
                         String msg = "用户20分钟未操作!";
                         Map<String, Object> mapResult = getMap(401, msg);
                         ResultUtil.responseJson(attributes.getResponse(), mapResult);
                         return false;
                     }
-                    redisTemplate.opsForValue().set(key, "1", 20, TimeUnit.MINUTES);//存入redis并设置过期时间
+                    redisTemplate.opsForValue().set(key, "1", 20, TimeUnit.MINUTES);*///存入redis并设置过期时间
                 } catch (
                         TokenException e) {
                     sysLog.setUserid("error");

service/publicapi/src/main/resources/bootstrap-prod.properties

@@ -10,13 +10,13 @@ logging.level.root=INFO
 
 #mysql\uFFFD\uFFFD\uFFFD\u077F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.xzxtdb.url=jdbc:mysql://10.142.16.191:4306/xzxt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+spring.datasource.xzxtdb.url=jdbc:mysql://65.26.107.159:4306/xzxt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 spring.datasource.xzxtdb.username=ENC(b7OXS5qvb3tVsaDbfqkFpg==)
 spring.datasource.xzxtdb.password=ENC(PhkJovHr5GezJgLS+gfSFaID3dNlmUi5)
 
 #oracle\uFFFD\uFFFD\uFFFD\u077F\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD(\u022B\uFFFD\uFFFD\uFFFD\uFFFD)
 spring.datasource.qgdb.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.qgdb.url=jdbc:mysql://10.142.16.191:4306/xzxt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
+spring.datasource.qgdb.url=jdbc:mysql://65.26.107.159:4306/xzxt?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
 spring.datasource.qgdb.username=ENC(b7OXS5qvb3tVsaDbfqkFpg==)
 spring.datasource.qgdb.password=ENC(PhkJovHr5GezJgLS+gfSFaID3dNlmUi5)