1

pom.xml

@@ -60,6 +60,10 @@
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>1.3.1</version>
         </dependency>
+        <dependency>  
+		    <groupId>org.springframework.boot</groupId>  
+		    <artifactId>spring-boot-starter-security</artifactId>  
+		</dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>

src/main/java/com/WebSecurityConfig.java

@@ -0,0 +1,24 @@
+package com;
+
+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/intelligent/basicdata/mapper/WareHouseBasicInfoMapper.xml

@@ -49,7 +49,7 @@
         t1.lypz,
         t1.lyxz,
         t1.lydj,
-        t1.kcsl,
+        t1.kcsl*1000,
         to_char(t1.rksj,'yyyy-MM-dd HH24:mi:ss') AS rq,
         to_char(t1.rksj,'yyyy-MM-dd HH24:mi:ss') AS rcrq,
         to_char(t1.input_time,'yyyy-MM-dd HH24:mi:ss') AS cjsj,

src/main/java/com/chinaitop/depot/intelligent/grainsituation/service/impl/TemperatureRecordServiceImpl.java

@@ -82,23 +82,15 @@ public class TemperatureRecordServiceImpl implements TemperatureRecordService {
     @Override
     public List<TTestdataLayer> findByHouseAndTime(String lqId, String vCfCode, String vDatatime, String orgId) {
         TTestdataLayerExample tTestdataLayerExample = new TTestdataLayerExample();
-        tTestdataLayerExample.setDistinct(true);
+        //tTestdataLayerExample.setDistinct(true);
         TTestdataLayerExample.Criteria criteria = tTestdataLayerExample.createCriteria();
-        if (StringUtils.isNotBlank(orgId))
+        if (StringUtils.isNotBlank(orgId)) {
             criteria.andOrgIdEqualTo(orgId);
-        if (StringUtils.isNotBlank(lqId))
+        }
+        if (StringUtils.isNotBlank(lqId)) {
             criteria.andLqIdEqualTo(lqId);
-        /*if (StringUtils.isNotBlank(vCfCode))
-            criteria.andLhouseEqualTo(vCfCode);
-        if (StringUtils.isNotBlank(vDatatime))
-            criteria.andLtimeEqualTo(DateUtils.stringToData(vDatatime));*/
-//        boolean result = ArrayUtils.contains(SPECIAL_ORG, orgId);
-//        if (result) {
-//        	tTestdataLayerExample.setOrderByClause("layerNumber ASC");
-//        } else {
-//        	tTestdataLayerExample.setOrderByClause("layerNumber DESC");
-//        }
-        
+        }
+
         tTestdataLayerExample.setOrderByClause("layerNumber ASC");
         
         List<TTestdataLayer> tTestdata = tTestdataLayerMapper.selectByExample(tTestdataLayerExample);

src/main/resources/bootstrap.yml

@@ -22,7 +22,7 @@ num_version3: :20013
 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
@@ -32,6 +32,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-intelligent