熏蒸业务变更开发和安全漏洞修复

pom.xml

@@ -51,6 +51,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
+        <!-- 安全验证 -->
+        <dependency>  
+		    <groupId>org.springframework.boot</groupId>  
+		    <artifactId>spring-boot-starter-security</artifactId>  
+		</dependency>
         <!-- gbase依赖包 -->
         <dependency>
             <groupId>com.gbase8s</groupId>

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationAlterController.java

@@ -115,12 +115,13 @@ public class FumigationAlterController {
     @RequestMapping(value="/saveFumigationAfterDate", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value="保存熏蒸善后信息", notes = "保存熏蒸善后信息")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "fumigationAfter", value = "熏蒸善后数据", paramType = "form")
+            @ApiImplicitParam(name = "fumigationAfter", value = "熏蒸善后数据", paramType = "form"),
+            @ApiImplicitParam(name = "fumigationProcess", value = "熏蒸过程数据", paramType = "form")
     })
-    public Map<String, Object> saveFumigationAfterDate(String fumigationAfter) {
+    public Map<String, Object> saveFumigationAfterDate(String fumigationAfter, String fumigationProcess) {
         Map<String, Object> modelMap = new HashMap<String, Object>();
         try {
-			modelMap = fumigationAfterService.saveOrUpdate(fumigationAfter);
+			modelMap = fumigationAfterService.saveOrUpdate(fumigationAfter, fumigationProcess);
 		} catch (Exception e) {
 			modelMap.put("status", "error");
 			log.error(e.getMessage(), e);

src/main/java/com/chinaitop/depot/fumigation/controller/FumigationProcessController.java

@@ -115,7 +115,7 @@ public class FumigationProcessController {
         tFumigationProcess.setDeleteState("1");//默认设置删除标志
         if (tFumigationProcess.getId() == null) {
             tFumigationProcess.setId(ParameterUtil.getCode());
-            tFumigationProcess.setCreateTime(new Date());//创建时间
+            //tFumigationProcess.setCreateTime(new Date());//创建时间
             tFumigationProcess.setUpdateTime(tFumigationProcess.getCreateTime());//修改时间
             fumigationProcessService.add(tFumigationProcess);
 

src/main/java/com/chinaitop/depot/fumigation/mapper/TFumigationAfterMapper.xml

@@ -45,6 +45,7 @@
     <result column="remark" property="remark" jdbcType="VARCHAR" />
     <result column="sjczsjzykssj" property="sjczsjzykssj" jdbcType="TIMESTAMP" />
     <result column="sjczsjzyjssj" property="sjczsjzyjssj" jdbcType="TIMESTAMP" />
+    <result column="data_status" property="dataStatus" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -112,7 +113,7 @@
     sampling_culture_month_half, kill_insect_rate, check_insect_cage_time, insect_cage_kill_rate, 
     effect_analysis, creater, create_time, update_time, org_id, delete_state, updatetime, 
     czsjzysj, czsjzyrs, czsjff, czsjzypzr, czclcs, czclzyrs, czclpzr, xzhhcjcqk, xzhckmd, 
-    pyswthhcs, pysswthhcs, xzxgpj,record_id,remark,sjczsjzykssj,sjczsjzyjssj
+    pyswthhcs, pysswthhcs, xzxgpj,record_id,remark,sjczsjzykssj,sjczsjzyjssj,data_status
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.fumigation.model.TFumigationAfterExample" >
     select
@@ -160,7 +161,7 @@
       czsjzyrs, czsjff, czsjzypzr, 
       czclcs, czclzyrs, czclpzr, 
       xzhhcjcqk, xzhckmd, pyswthhcs, 
-      pysswthhcs, xzxgpj,record_id,remark,sjczsjzykssj,sjczsjzyjssj)
+      pysswthhcs, xzxgpj,record_id,remark,sjczsjzykssj,sjczsjzyjssj, data_status)
     values (#{id,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, #{fumigationId,jdbcType=VARCHAR}, 
       #{residueCollectionTime,jdbcType=VARCHAR}, #{numberOperationsCollected,jdbcType=VARCHAR}, 
       #{residueCollectionMethod,jdbcType=VARCHAR}, #{collectJobApprover,jdbcType=VARCHAR}, 
@@ -177,7 +178,8 @@
       #{czclcs,jdbcType=VARCHAR}, #{czclzyrs,jdbcType=INTEGER}, #{czclpzr,jdbcType=VARCHAR}, 
       #{xzhhcjcqk,jdbcType=VARCHAR}, #{xzhckmd,jdbcType=INTEGER}, #{pyswthhcs,jdbcType=INTEGER}, 
       #{pysswthhcs,jdbcType=INTEGER}, #{xzxgpj,jdbcType=VARCHAR},#{recordId,jdbcType=VARCHAR},
-      #{remark,jdbcType=VARCHAR},#{sjczsjzykssj,jdbcType=TIMESTAMP},#{sjczsjzyjssj,jdbcType=TIMESTAMP})
+      #{remark,jdbcType=VARCHAR},#{sjczsjzykssj,jdbcType=TIMESTAMP},#{sjczsjzyjssj,jdbcType=TIMESTAMP},
+      #{dataStatus,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.fumigation.model.TFumigationAfter" >
     insert into t_fumigation_after
@@ -308,6 +310,9 @@
       <if test="sjczsjzyjssj != null" >
         sjczsjzyjssj,
       </if>
+      <if test="dataStatus != null">
+        data_status,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -436,6 +441,9 @@
       <if test="sjczsjzyjssj != null" >
         #{sjczsjzyjssj,jdbcType=TIMESTAMP},
       </if>
+      <if test="dataStatus != null">
+        #{dataStatus,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.fumigation.model.TFumigationAfterExample" resultType="java.lang.Integer" >
@@ -573,6 +581,9 @@
       <if test="record.sjczsjzyjssj != null" >
         sjczsjzyjssj = #{record.sjczsjzyjssj,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.dataStatus != null">
+        data_status = #{record.dataStatus,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -621,7 +632,8 @@
       xzxgpj = #{record.xzxgpj,jdbcType=VARCHAR},
       remark = #{record.remark,jdbcType=VARCHAR},
       sjczsjzykssj = #{record.sjczsjzykssj,jdbcType=TIMESTAMP},
-      sjczsjzyjssj = #{record.sjczsjzyjssj,jdbcType=TIMESTAMP}
+      sjczsjzyjssj = #{record.sjczsjzyjssj,jdbcType=TIMESTAMP},
+      data_status = #{record.dataStatus,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -752,6 +764,9 @@
       <if test="sjczsjzyjssj != null" >
         sjczsjzyjssj = #{sjczsjzyjssj,jdbcType=TIMESTAMP},
       </if>
+      <if test="dataStatus != null">
+        data_status = #{dataStatus,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -797,7 +812,8 @@
       xzxgpj = #{xzxgpj,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
       sjczsjzykssj = #{sjczsjzykssj,jdbcType=TIMESTAMP},
-      sjczsjzyjssj = #{sjczsjzyjssj,jdbcType=TIMESTAMP}
+      sjczsjzyjssj = #{sjczsjzyjssj,jdbcType=TIMESTAMP},
+      data_status = #{dataStatus,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -810,7 +826,8 @@
     record.yjmc drugName,
     af.creater,
     af.create_time createTime,
-    record.id recordId
+    record.id recordId,
+    af.data_status datastatus
     FROM
     t_fumigation_after af
     INNER JOIN t_fumigation_forrecord record ON af.record_id = record.id

src/main/java/com/chinaitop/depot/fumigation/mapper/TFumigationProcessMapper.xml

@@ -93,6 +93,7 @@
     <result column="yjmc" property="yjmc" jdbcType="INTEGER" />
     <result column="jx" property="jx" jdbcType="INTEGER" />
     <result column="lyhjzl" property="lyhjzl" jdbcType="VARCHAR" />
+    <result column="cjr" property="cjr" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -169,7 +170,7 @@
     task_state, task_end_time, creater, create_time, update_time, org_id, delete_state, 
     data_source, updatetime, yqbjyaqjc, byqcnlhqnd, mbnd, jsbyl, byzypzr, fznd, mbndwcts, 
     lswzjc, lqbwcqdbjcs, mbsj, ctz, sqqlhqnd, sqpzr, sqcsts, sqjsslhqnd,record_id,remark,data_status,
-    yjlysqbh, yjmc, jx, lyhjzl
+    yjlysqbh, yjmc, jx, lyhjzl, cjr
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.fumigation.model.TFumigationProcessExample" >
     select
@@ -233,7 +234,7 @@
       jsbyl, byzypzr, fznd, 
       mbndwcts, lswzjc, lqbwcqdbjcs, 
       mbsj, ctz, sqqlhqnd, 
-      sqpzr, sqcsts, sqjsslhqnd,record_id,remark,data_status, yjlysqbh, yjmc, jx, lyhjzl
+      sqpzr, sqcsts, sqjsslhqnd,record_id,remark,data_status, yjlysqbh, yjmc, jx, lyhjzl, cjr
       )
     values (#{id,jdbcType=VARCHAR}, #{fumigationId,jdbcType=VARCHAR}, #{concentration,jdbcType=VARCHAR}, 
       #{heapMedication,jdbcType=VARCHAR}, #{spaceMedication,jdbcType=VARCHAR}, #{deliquescenceMethod,jdbcType=VARCHAR}, 
@@ -268,7 +269,7 @@
       #{mbsj,jdbcType=INTEGER}, #{ctz,jdbcType=DECIMAL}, #{sqqlhqnd,jdbcType=DECIMAL}, 
       #{sqpzr,jdbcType=VARCHAR}, #{sqcsts,jdbcType=INTEGER}, #{sqjsslhqnd,jdbcType=DECIMAL},#{recordId,jdbcType=VARCHAR},
       #{remark,jdbcType=VARCHAR},#{dataStatus,jdbcType=VARCHAR},#{yjlysqbh,jdbcType=VARCHAR}, #{yjmc,jdbcType=INTEGER}, 
-      #{jx,jdbcType=INTEGER}, #{lyhjzl,jdbcType=VARCHAR})
+      #{jx,jdbcType=INTEGER}, #{lyhjzl,jdbcType=VARCHAR}, #{cjr,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.fumigation.model.TFumigationProcess" >
     insert into t_fumigation_process
@@ -543,6 +544,9 @@
       <if test="lyhjzl != null">
         lyhjzl,
       </if>
+      <if test="cjr != null">
+        cjr,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -815,6 +819,9 @@
       <if test="lyhjzl != null">
         #{lyhjzl,jdbcType=VARCHAR},
       </if>
+      <if test="cjr != null">
+        #{cjr,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.fumigation.model.TFumigationProcessExample" resultType="java.lang.Integer" >
@@ -1096,6 +1103,9 @@
       <if test="record.lyhjzl != null">
         lyhjzl = #{record.lyhjzl,jdbcType=VARCHAR},
       </if>
+      <if test="record.cjr != null">
+        cjr = #{record.cjr,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -1192,7 +1202,8 @@
       yjlysqbh = #{record.yjlysqbh,jdbcType=VARCHAR},
       yjmc = #{record.yjmc,jdbcType=INTEGER},
       jx = #{record.jx,jdbcType=INTEGER},
-      lyhjzl = #{record.lyhjzl,jdbcType=VARCHAR}
+      lyhjzl = #{record.lyhjzl,jdbcType=VARCHAR},
+      cjr = #{record.cjr,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -1470,6 +1481,9 @@
       <if test="lyhjzl != null">
         lyhjzl = #{lyhjzl,jdbcType=VARCHAR},
       </if>
+      <if test="cjr != null">
+        cjr = #{cjr,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -1564,7 +1578,8 @@
       yjlysqbh = #{yjlysqbh,jdbcType=VARCHAR},
       yjmc = #{yjmc,jdbcType=INTEGER},
       jx = #{jx,jdbcType=INTEGER},
-      lyhjzl = #{lyhjzl,jdbcType=VARCHAR}
+      lyhjzl = #{lyhjzl,jdbcType=VARCHAR},
+      cjr = #{cjr,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 
@@ -1575,10 +1590,11 @@
     record.house_id houseId,
     record.lspz grainKind,
     record.yjmc drugName,
-    case when record.cgxzfs!='' then '常规熏蒸' when record.hlxzfs!='' then '环流熏蒸方式' when record.hlxzynhljsjh!='' then '环流熏蒸与内环流技术结合' else '常规熏蒸' end fumigationType,
+    case record.xzfs when '5245' then '常规熏蒸' when '5246' then '环流熏蒸方式' when '5248' then '环流熏蒸与内环流技术结合' else '常规熏蒸' end fumigationType,
     record.creater,
     to_char(pro.create_time, 'yyyy-mm-dd hh24:mi:ss') createTime,
-    record.id recordId
+    record.id recordId,
+    pro.data_status datastatus
     FROM
     t_fumigation_process pro
     INNER JOIN t_fumigation_forrecord record ON pro.record_id = record.id
@@ -1612,7 +1628,7 @@
     drug_residue_rate, dcsqtinfo_id, task_state,
     task_end_time, creater, create_time,
     update_time, org_id, delete_state,
-    data_source,record_id,remark,data_status, yjlysqbh, yjmc, jx, lyhjzl)
+    data_source,record_id,remark,data_status, yjlysqbh, yjmc, jx, lyhjzl, cjr)
     values
     <foreach collection="list" item="process" index="index" separator=",">
       (#{process.id,jdbcType=INTEGER}, #{process.fumigationId,jdbcType=VARCHAR}, #{process.firstUseDrugTime,jdbcType=TIMESTAMP},
@@ -1632,7 +1648,8 @@
       #{process.taskEndTime,jdbcType=TIMESTAMP}, #{process.creater,jdbcType=INTEGER}, #{process.createTime,jdbcType=TIMESTAMP},
       #{process.updateTime,jdbcType=TIMESTAMP}, #{process.orgId,jdbcType=INTEGER}, #{process.deleteState,jdbcType=VARCHAR},
       #{process.dataSource,jdbcType=VARCHAR},#{process.recordId,jdbcType=VARCHAR}, #{process.remark,jdbcType=VARCHAR},#{process.dataStatus,jdbcType=VARCHAR},
-      #{process.yjlysqbh,jdbcType=VARCHAR}, #{process.yjmc,jdbcType=INTEGER}, #{process.jx,jdbcType=INTEGER}, #{process.lyhjzl,jdbcType=VARCHAR})
+      #{process.yjlysqbh,jdbcType=VARCHAR}, #{process.yjmc,jdbcType=INTEGER}, #{process.jx,jdbcType=INTEGER}, #{process.lyhjzl,jdbcType=VARCHAR},
+      #{process.cjr,jdbcType=VARCHAR})
     </foreach>
   </insert>
 </mapper>

src/main/java/com/chinaitop/depot/fumigation/model/TFumigationAfter.java

@@ -95,6 +95,9 @@ public class TFumigationAfter {
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date sjczsjzyjssj;
 
+    // 数据状态(0:保存,1:提交)
+    private String dataStatus;
+
     /**
      * 备案id
      */
@@ -771,4 +774,20 @@ public class TFumigationAfter {
 	public void setSjczsjzyjssj(Date sjczsjzyjssj) {
 		this.sjczsjzyjssj = sjczsjzyjssj;
 	}
+
+	/**
+	 * 数据状态(0:保存,1:提交)
+	 * @return
+	 */
+	public String getDataStatus() {
+		return dataStatus;
+	}
+
+	/**
+	 * 数据状态(0:保存,1:提交)
+	 * @param dataStatus
+	 */
+	public void setDataStatus(String dataStatus) {
+		this.dataStatus = dataStatus;
+	}
 }

src/main/java/com/chinaitop/depot/fumigation/model/TFumigationProcess.java

@@ -214,6 +214,9 @@ public class TFumigationProcess {
     //领用合计总量
     private String lyhjzl;
 
+    //创建人
+    private String cjr;
+
     /**
      * 熏蒸过程表
      * @return id 熏蒸过程表
@@ -1677,5 +1680,21 @@ public class TFumigationProcess {
 	public void setLyhjzl(String lyhjzl) {
 		this.lyhjzl = lyhjzl;
 	}
+
+	/**
+	 * 创建人
+	 * @return
+	 */
+	public String getCjr() {
+		return cjr;
+	}
+
+	/**
+	 * 创建人
+	 * @param cjr
+	 */
+	public void setCjr(String cjr) {
+		this.cjr = cjr;
+	}
     
 }

src/main/java/com/chinaitop/depot/fumigation/service/FumigationAfterService.java

@@ -37,8 +37,9 @@ public interface FumigationAfterService {
     /**
      * 保存熏蒸善后数据
      * @param fumigationAfter
+     * @param fumigationProcess
      * @return
      * @throws Exception
      */
-	Map<String, Object> saveOrUpdate(String fumigationAfter) throws Exception;
+	Map<String, Object> saveOrUpdate(String fumigationAfter, String fumigationProcess) throws Exception;
 }

src/main/java/com/chinaitop/depot/fumigation/service/impl/FumigationAfterServiceImpl.java

@@ -84,7 +84,7 @@ public class FumigationAfterServiceImpl implements FumigationAfterService {
     }
 
 	@Override
-	public Map<String, Object> saveOrUpdate(String fumigationAfter) throws Exception {
+	public Map<String, Object> saveOrUpdate(String fumigationAfter, String fumigationProcess) throws Exception {
 		Map<String, Object> modelMap = new HashMap<String, Object>();
         // JSON字符串转对象
         ObjectMapper mapper = new ObjectMapper();
@@ -97,19 +97,21 @@ public class FumigationAfterServiceImpl implements FumigationAfterService {
 
             add(tFumigationAfter);
 
-            //修改熏蒸状态
-            TFumigationForrecordExample example = new TFumigationForrecordExample();
-            TFumigationForrecordExample.Criteria criteria = example.createCriteria();
-            criteria.andIdEqualTo(tFumigationAfter.getRecordId());
-
-            TFumigationForrecord tFumigationForrecord = new TFumigationForrecord();
-            tFumigationForrecord.setState(10);
-            fumigationForRecordService.updateByExample(tFumigationForrecord, example);
 
         } else {
             tFumigationAfter.setUpdateTime(new Date());//修改时间
             update(tFumigationAfter);
         }
+        //修改熏蒸状态
+        if ("1".equals(tFumigationAfter.getDataStatus())) {
+        	TFumigationForrecordExample example = new TFumigationForrecordExample();
+        	TFumigationForrecordExample.Criteria criteria = example.createCriteria();
+        	criteria.andIdEqualTo(tFumigationAfter.getRecordId());
+        	
+        	TFumigationForrecord tFumigationForrecord = new TFumigationForrecord();
+        	tFumigationForrecord.setState(10);
+        	fumigationForRecordService.updateByExample(tFumigationForrecord, example);
+        }
         
         //把善后结果中[残渣收集作业结束时间]返回给市平台
         pushFAfterData(ParameterUtil.datetime2string(tFumigationAfter.getSjczsjzyjssj()), tFumigationAfter.getRecordId());

src/main/java/com/chinaitop/depot/utils/WebSecurityConfig.java

@@ -0,0 +1,24 @@
+package com.chinaitop.depot.utils;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+@EnableWebSecurity
+public class WebSecurityConfig 
+extends WebSecurityConfigurerAdapter 
+{
+
+	@Override
+    protected void configure(HttpSecurity http) throws Exception {
+		http.authorizeRequests()
+		.antMatchers("/**")
+		.permitAll() //允许所有用户访问所有资源
+        .and()
+        .csrf().disable(); // 禁用CSRF（防止伪造的跨域攻击）
+
+        super.configure(http);
+    }
+}

src/main/resources/bootstrap.yml

@@ -10,7 +10,7 @@ mybatis:
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:9001/eureka/
+      defaultZone: http://tj_admin:Admin_1234@${eureka.instance.hostname}:9001/eureka/
     #register-with-eureka: false
     #fetchRegistry: false
   instance:
@@ -20,6 +20,10 @@ eureka:
     lease-expiration-duration-in-seconds: 30
     status-page-url: http://${eureka.instance.hostname}:${server.port}/swagger-ui.html
 
+management:
+  server:
+    port: -1
+
 spring:
   application:
     name: depot-storage
@@ -30,6 +34,9 @@ spring:
     url: jdbc:gbasedbt-sqli://101.36.160.140:19089/depot:INFORMIXSERVER=ol_gbasedbt1210;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8;
     username: gbasedbt
     password: cDbK2S0go8
+    #url: jdbc:gbasedbt-sqli://10.223.3.63:9088/depot:GBASEDBTSERVER=gbaseserver2;DB_LOCALE=zh_CN.utf8;CLIENT_LOCALE=zh_CN.utf8;NEWCODESET=UTF8,utf8,57372;GL_USEGLU=1;
+    #username: gbasedbt
+    #password: 4E7#8x8Yut
   session:
     store-type: redis
   redis:
@@ -53,9 +60,9 @@ spring:
       max-request-size: 20MB
   # 缓存配置 host: redis-depot
 web:
-  upload-path: /home/depot/depot-web/apache-tomcat-8.0.53/webapps/ROOT/WEB-INF/classes/static
+  upload-path: /home/depot/depot-web/depot-file
 
 api:
   safety:
-    host: localhost
-    port: 8765
+    host: 172.16.0.73
+    port: 8097