更换网格管理的查询条件

src/main/java/com/zoniot/ccrc/controller/GridManagementController.java

@@ -123,7 +123,7 @@ public class GridManagementController {
      */
     @RequestMapping(value = "getCommutityByOrg", method = RequestMethod.POST)
     @ApiOperation(value = "查询小区信息")
-    public AjaxMessage<List<Community>> selectGridPage(Integer orgId) {
+    public AjaxMessage<List<Community>> getCommutityByOrg(Integer orgId) {
 
         List<Community>communities=gridManagementService.getCommutityByOrg(orgId);
 
@@ -153,9 +153,9 @@ public class GridManagementController {
      */
     @RequestMapping(value = "getDevices", method = RequestMethod.POST)
     @ApiOperation(value = "查询建筑信息")
-    public AjaxMessage<List<Device>> getDevices(Integer buildingId, Integer userId, String address) {
+    public AjaxMessage<List<Device>> getDevices(Integer communityId, Integer userId, String address) {
 
-        List<Device>devices=gridManagementService.getDevices(buildingId,userId,address);
+        List<Device>devices=gridManagementService.getDevices(communityId,userId,address);
 
         return new AjaxMessage<>(ResultStatus.OK, devices);
     }

src/main/java/com/zoniot/ccrc/scheduled/SyncData.java

@@ -32,7 +32,6 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @Service
@@ -165,7 +164,7 @@ public class SyncData {
                     meterReadRecordList.clear();
                 }
             }
-            if(meterReadRecordList.size() != 0){
+            if(!meterReadRecordList.isEmpty()){
                 int insert = meterReadRecordMapper.batchInsert(meterReadRecordList);
                 i = i+insert ;
                 meterReadRecordList.clear();
@@ -252,7 +251,7 @@ public class SyncData {
             meterReadRecord.setReadTime(changeDateType(meterRecord.getReadingTime()));
             meterReadRecord.setReadData(reading);
             BigDecimal todayCost =  BigDecimal.valueOf(calculateTodayCost(reading,
-                    new Double(meterReadRecord.getLastValid()),meterReadRecord));
+                    new Double(meterReadRecord.getLastValid())));
 
             todayCost = todayCost.setScale(3,BigDecimal.ROUND_HALF_UP);
             meterReadRecord.setLastCost(todayCost);
@@ -263,12 +262,12 @@ public class SyncData {
         }
 
     }
-    private   Double calculateTodayCost(String currentReading,Double lastValid,MeterReadRecord record){
+    private   Double calculateTodayCost(String currentReading,Double lastValid){
 
 
         Double currentValid = new Double(currentReading);
-        Double  cost = currentValid-lastValid;
-        return cost ;
+        return currentValid-lastValid;
+
     }
     /**
      * 获取水表最后止度,先从缓存中获取止度,缓存无数据则从数据库中获取
@@ -330,15 +329,13 @@ public class SyncData {
      * @return
      */
     protected String getMeterLastDataFromCache(Long deviceId){
-        Map<String, MeasuringData> data = null;
         return redisUtil.get(Constants.PREFIX_CACHE_FLAG+deviceId);
 
 
     }
 
     public MeterReadRecord findRecordByMeterIdAndReadDate(WaterMeter waterMeter, Integer readDate) {
-        MeterReadRecord record = meterReadRecordMapper.findRecordByReadDayAndDeviceId(waterMeter.getDeviceId(), readDate);
-        return record;
+        return meterReadRecordMapper.findRecordByReadDayAndDeviceId(waterMeter.getDeviceId(), readDate);
     }
     protected  void setMeterLastDataToCache(Long deviceId ,String measuringData){
         redisUtil.set(Constants.PREFIX_CACHE_FLAG+deviceId,measuringData);

src/main/java/com/zoniot/ccrc/security/WebSecurityConfig.java

@@ -98,7 +98,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
                 .and().authorizeRequests()
                 .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()
-               // .anyRequest().authenticated()
+                .anyRequest().authenticated()
                 .and()
                 .formLogin()
                 .successHandler(authenticationSuccessHandler)//登陆成功处理

src/main/resources/mapper/GridManagementMapper.xml

@@ -37,10 +37,10 @@
     <!--通过实体作为筛选条件查询-->
     <select id="selectList" resultMap="GridManagementMap">
         select
-         a.*,b.meter_no,b.loc_desc address,c.name bulidingName,
+         a.*,b.meter_no,b.loc_desc address,
          e.name orgName,b.file_no
         from sc_grid_management a join sc_device b on a.device_id=b.id
-        join sc_building c on b.building_id=c.id join sc_community d on c.community_id =d.id
+        join sc_community d on b.community_id =d.id
         left join sc_organization e on d.org_id=e.id
         <where>
              a.status=1