1

pom.xml

@@ -54,6 +54,10 @@
 			<artifactId>commons-lang3</artifactId>
 			<version>3.7</version>
 		</dependency>
+		<dependency>  
+		    <groupId>org.springframework.boot</groupId>  
+		    <artifactId>spring-boot-starter-security</artifactId>  
+		</dependency>
 
 		<!-- swagger2 -->
 		<dependency>

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

@@ -0,0 +1,24 @@
+package com.chinaitop.depot;
+
+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/java/com/chinaitop/depot/device/controller/DSblxxjyController.java

@@ -99,6 +99,7 @@ public class DSblxxjyController {
             // 生成设备器材编码
             if (StringUtils.isBlank(dSbxxsjy.getSbbh())) {
                 dSbxxsjy.setSbbh(GeneratingEncodUtils.gotSbbh(dSbxxsjy.getSzdwdm()));
+                dSbxxsjy.setCreateTime(new Date());
                 sblxxjyService.save(dSbxxsjy); // 新增
             } else {
                 sblxxjyService.update(dSbxxsjy); // 修改

src/main/java/com/chinaitop/depot/device/mapper/DSbxxsjyMapper.xml

@@ -64,6 +64,8 @@
     <result column="shsj" property="shsj" jdbcType="DATE" />
     <result column="jddw" property="jddw" jdbcType="VARCHAR" />
     <result column="jdsj" property="jdsj" jdbcType="VARCHAR" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="sbyqid" property="sbyqid" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -129,7 +131,7 @@
     creator_code, create_date, refresher, refresher_code, refresh_time, remark, sfba, 
     szdwmc, szdwdm, jszt, sbsl, jscs, sblx, mqzt, sfzc, ccbm, sbbm, qyrq, ssfl, jg_id, 
     fzd, sbdwmc, zcbh, scrq, rkrq, sbflbh, pzr, cgr, wxdh, bxqx, sblxbh, sbazr, shrmc, 
-    shyj, shsj, jddw, jdsj
+    shyj, shsj, jddw, jdsj, create_time, sbyqid
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.device.model.DSbxxsjyExample" >
     select
@@ -169,7 +171,7 @@
       zcbh, scrq, rkrq, sbflbh, 
       pzr, cgr, wxdh, bxqx, 
       sblxbh, sbazr, shrmc, 
-      shyj, shsj, jddw, jdsj)
+      shyj, shsj, jddw, jdsj, create_time, sbyqid)
     values (#{sbbh,jdbcType=VARCHAR}, #{sbyqmc,jdbcType=VARCHAR}, #{kddm,jdbcType=VARCHAR}, 
       #{sbggxh,jdbcType=VARCHAR}, #{sbms,jdbcType=VARCHAR}, #{sbzt,jdbcType=VARCHAR}, 
       #{sbfl,jdbcType=VARCHAR}, #{sccj,jdbcType=VARCHAR}, #{cgjg,jdbcType=VARCHAR}, #{sbglz,jdbcType=VARCHAR}, 
@@ -187,7 +189,8 @@
       #{zcbh,jdbcType=VARCHAR}, #{scrq,jdbcType=DATE}, #{rkrq,jdbcType=DATE}, #{sbflbh,jdbcType=VARCHAR}, 
       #{pzr,jdbcType=VARCHAR}, #{cgr,jdbcType=VARCHAR}, #{wxdh,jdbcType=VARCHAR}, #{bxqx,jdbcType=VARCHAR}, 
       #{sblxbh,jdbcType=VARCHAR}, #{sbazr,jdbcType=VARCHAR}, #{shrmc,jdbcType=VARCHAR}, 
-      #{shyj,jdbcType=VARCHAR}, #{shsj,jdbcType=DATE}, #{jddw,jdbcType=VARCHAR}, #{jdsj,jdbcType=VARCHAR})
+      #{shyj,jdbcType=VARCHAR}, #{shsj,jdbcType=DATE}, #{jddw,jdbcType=VARCHAR}, #{jdsj,jdbcType=VARCHAR},
+      #{createTime,jdbcType=TIMESTAMP}, #{sbyqid,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.device.model.DSbxxsjy" >
     insert into d_sbxxsjy
@@ -378,6 +381,12 @@
       <if test="jdsj != null">
         jdsj,
       </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="sbyqid != null">
+        sbyqid,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="sbbh != null" >
@@ -566,6 +575,12 @@
       <if test="jdsj != null">
         #{jdsj,jdbcType=VARCHAR},
       </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="sbyqid != null">
+        #{sbyqid,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.device.model.DSbxxsjyExample" resultType="java.lang.Integer" >
@@ -763,6 +778,12 @@
       <if test="record.jdsj != null">
         jdsj = #{record.jdsj,jdbcType=VARCHAR},
       </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.sbyqid != null">
+        sbyqid = #{record.sbyqid,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -831,7 +852,9 @@
       shyj = #{record.shyj,jdbcType=VARCHAR},
       shsj = #{record.shsj,jdbcType=DATE},
       jddw = #{record.jddw,jdbcType=VARCHAR},
-      jdsj = #{record.jdsj,jdbcType=VARCHAR}
+      jdsj = #{record.jdsj,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      sbyqid = #{record.sbyqid,jdbcType=INTEGER}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>

src/main/java/com/chinaitop/depot/device/model/DSbxxsjy.java

@@ -127,9 +127,15 @@ public class DSbxxsjy {
 
     private String jddw;
 
-    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date jdsj;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    //设备仪器id
+    private Integer sbyqid;
+
     /**
      * 设备编号
      * @return sbbh 设备编号
@@ -1122,4 +1128,36 @@ public class DSbxxsjy {
 		this.jdsj = jdsj;
 	}
 
+	/**
+	 * 创建时间
+	 * @return
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * 创建时间
+	 * @param createTime
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * 设备仪器ID
+	 * @return
+	 */
+	public Integer getSbyqid() {
+		return sbyqid;
+	}
+
+	/**
+	 * 设备仪器ID
+	 * @param sbyqid
+	 */
+	public void setSbyqid(Integer sbyqid) {
+		this.sbyqid = sbyqid;
+	}
+
 }

src/main/java/com/chinaitop/depot/device/service/impl/StorageJsglServiceImpl.java

@@ -94,7 +94,7 @@ public class StorageJsglServiceImpl implements StorageJsglService {
 		} else {
 			updateStorageJsgl(storageJsgl);
 		}
-		if ("1".equals(storageJsgl.getDataStatus())) {
+		if ("1".equals(storageJsgl.getDataStatus()) && "1".equals(storageJsgl.getYwlx())) {
 			depotBusinessFeignService.updateYjssl(Integer.parseInt(storageJsgl.getHtid()), storageJsgl.getBcjssl().toString());
 		}
 	}

src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ mybatis:
 eureka:
   client:
     service-url:
-      defaultZone: http://localhost:9001/eureka/
+      defaultZone: http://tj_admin:Admin_1234@${eureka.instance.hostname}:9001/eureka/
   instance:
     hostname: 172.16.0.16
     prefer-ip-address: true
@@ -18,6 +18,11 @@ eureka:
     # 告知服务端30秒还未收到心跳的话，就将该服务移除列表(默认90s)
     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-device
@@ -54,4 +59,4 @@ spring:
     date-format: yyyy-MM-dd
     time-zone: GMT+8
 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