修改接口空指针

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/TdHYGFInverterDayGenerateMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 
 public interface TdHYGFInverterDayGenerateMapper extends BaseMapper<TdHYGFInverterDayGenerate> {
-    List<Map<String,Object>> selectDayTrend(List<String> treeParams, String time, String snCode, String thirdStationId);
+    List<Map<String,Object>> selectDayTrend(List<String> treeParams, String time, String time2, String snCode, String thirdStationId);
 
     @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     List<TdHYGFInverterDayGenerate> selectList(@Param(Constants.WRAPPER) Wrapper<TdHYGFInverterDayGenerate> queryWrapper);

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/TdHYGFInverterDayGenerateMapper.xml

@@ -12,7 +12,7 @@
            from
         house_pv_data.td_hygf_inverter_day_generate
         <where>
-            created_time >= #{time}
+            created_time >= #{time} and created_time &lt;= #{time2}
             <if test="snCode != null and snCode !=''">
                and sn_code = #{snCode}
             </if>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpInverterController.java

@@ -68,83 +68,82 @@ public class JpInverterController extends BaseController {
 
     @Autowired
     JpPersonStationMapper pPersonStationMapper;
-	@Value("classpath:/json/paramsTree.json")
-	private Resource paramsTree;
-
-
-
-	/**
-	 * 新增户用光伏监盘逆变器表
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增户用光伏监盘逆变器表", notes = "新增户用光伏监盘逆变器表")
-	public ResponseModel<JpInverterDto> save(@RequestBody JpInverterDto model) {
-		model = jpInverterServiceImpl.createWithModel(model);
-		return ResponseHelper.buildResponse(model);
-	}
-
-	/**
-	 * 根据sequenceNbr更新
-	 *
-	 * @param sequenceNbr 主键
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新户用光伏监盘逆变器表", notes = "根据sequenceNbr更新户用光伏监盘逆变器表")
-	public ResponseModel<JpInverterDto> updateBySequenceNbrJpInverter(@RequestBody JpInverterDto model,
-			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-		model.setSequenceNbr(sequenceNbr);
-		return ResponseHelper.buildResponse(jpInverterServiceImpl.updateWithModel(model));
-	}
-
-	/**
-	 * 根据sequenceNbr删除
-	 *
-	 * @param sequenceNbr 主键
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@DeleteMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除户用光伏监盘逆变器表", notes = "根据sequenceNbr删除户用光伏监盘逆变器表")
-	public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
-			@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-		return ResponseHelper.buildResponse(jpInverterServiceImpl.removeById(sequenceNbr));
-	}
-
-	/**
-	 * 根据sequenceNbr查询
-	 *
-	 * @param sequenceNbr 主键
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏监盘逆变器表", notes = "根据sequenceNbr查询单个户用光伏监盘逆变器表")
-	public ResponseModel<JpInverterDto> selectOne(@PathVariable Long sequenceNbr) {
+    @Value("classpath:/json/paramsTree.json")
+    private Resource paramsTree;
+
+
+    /**
+     * 新增户用光伏监盘逆变器表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增户用光伏监盘逆变器表", notes = "新增户用光伏监盘逆变器表")
+    public ResponseModel<JpInverterDto> save(@RequestBody JpInverterDto model) {
+        model = jpInverterServiceImpl.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新户用光伏监盘逆变器表", notes = "根据sequenceNbr更新户用光伏监盘逆变器表")
+    public ResponseModel<JpInverterDto> updateBySequenceNbrJpInverter(@RequestBody JpInverterDto model,
+                                                                      @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(jpInverterServiceImpl.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除户用光伏监盘逆变器表", notes = "根据sequenceNbr删除户用光伏监盘逆变器表")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request,
+                                                      @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jpInverterServiceImpl.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个户用光伏监盘逆变器表", notes = "根据sequenceNbr查询单个户用光伏监盘逆变器表")
+    public ResponseModel<JpInverterDto> selectOne(@PathVariable Long sequenceNbr) {
         JpInverterDto jpInverter=  jpInverterServiceImpl.queryBySeq(sequenceNbr);
         jpInverter.setDayPowerGeneration(jpInverter.getDayPowerGeneration()!=null?jpInverter.getDayPowerGeneration()/1000:0);
         jpInverter.setMonthPowerGeneration(jpInverter.getMonthPowerGeneration()!=null?jpInverter.getMonthPowerGeneration()/1000:0);
         jpInverter.setYearPowerGeneration(jpInverter.getYearPowerGeneration()!=null?jpInverter.getYearPowerGeneration()/1000:0);
         jpInverter.setTotalPowerGeneration(jpInverter.getTotalPowerGeneration()!=null?jpInverter.getTotalPowerGeneration()/1000:0);
         return ResponseHelper.buildResponse(jpInverter);
-	}
-
-	/**
-	 * 列表分页查询
-	 *
-	 * @param current 当前页
-	 * @param current 每页大小
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器表分页查询", notes = "户用光伏监盘逆变器表分页查询")
-	public ResponseModel<Page<JpInverterDto>> queryForPage(@RequestParam(value = "current") int current,
-			@RequestParam(value = "size") int size, JpInverterDto jpInverterDto) {
+    }
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET", value = "户用光伏监盘逆变器表分页查询", notes = "户用光伏监盘逆变器表分页查询")
+    public ResponseModel<Page<JpInverterDto>> queryForPage(@RequestParam(value = "current") int current,
+                                                           @RequestParam(value = "size") int size, JpInverterDto jpInverterDto) {
 
         List<JpPersonStation> pPersonStation =null;
         if(jpInverterDto.getName()!=null&&!"".equals(jpInverterDto.getName())){
@@ -226,28 +225,32 @@ public class JpInverterController extends BaseController {
 		String thirdStationId = treeParams.get("thirdStationId").toString();
 		if (treeParams.get("date").equals("day")){
 			time = time+ " 00:00:00";
-            Date date = null;
-            try {
-                date = DateUtils.dateParse(time, null);
-                Date date1 = DateUtils.dateAddHours(date, -8);
-                time = DateUtils.dateTimeToDateStringIfTimeEndZero(date1);
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
+            String time2 = treeParams.get("time").toString()+ " 23:59:59";
+//            Date date = null;
+//            Date date2 = null;
+//            try {
+//                date = DateUtils.dateParse(time, null);
+//                date2 = DateUtils.dateParse(time2, null);
+////                Date date1 = DateUtils.dateAddHours(date, -8);
+//                time = DateUtils.dateTimeToDateStringIfTimeEndZero(date);
+//                time2 = DateUtils.dateTimeToDateStringIfTimeEndZero(date2);
+//            } catch (ParseException e) {
+//                e.printStackTrace();
+//            }
             List<JSONObject> treeParams1 = parseArray(JSONObject.toJSONString(treeParams.get("treeParams")), JSONObject.class);
             if (CollectionUtils.isEmpty(treeParams1)){
                 Map<String,Object> obj = new HashMap<>();
                 return ResponseHelper.buildResponse(obj);
             }
-			return   ResponseHelper.buildResponse(jpInverterServiceImpl.selectDayTrend(treeParams1, time, snCode, thirdStationId));
-		}else if (treeParams.get("date").equals("month")){
-			return ResponseHelper.buildResponse(jpInverterServiceImpl.selectMonthTrend(time, snCode, thirdStationId));
-		}else if (treeParams.get("date").equals("year")) {
+            return   ResponseHelper.buildResponse(jpInverterServiceImpl.selectDayTrend(treeParams1, time,time2, snCode, thirdStationId));
+        }else if (treeParams.get("date").equals("month")){
+            return ResponseHelper.buildResponse(jpInverterServiceImpl.selectMonthTrend(time, snCode, thirdStationId));
+        }else if (treeParams.get("date").equals("year")) {
             return ResponseHelper.buildResponse(jpInverterServiceImpl.selectYearTrend(time, snCode, thirdStationId));
         }else {
             return ResponseHelper.buildResponse(jpInverterServiceImpl.selectTotalTrend(time, snCode, thirdStationId));
         }
-	}
+    }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getInverterSncodes")
@@ -382,13 +385,13 @@ public class JpInverterController extends BaseController {
     }
 
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-	@GetMapping(value = "/jpInverterTotal")
-	@ApiOperation(httpMethod = "GET", value = "逆变器详折线图上方统计", notes = "逆变器详折线图上方统计")
-	public ResponseModel<Map<String,Object>> jpInverterTotal( String time,String snCode,String thirdStationId,String date) {
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/jpInverterTotal")
+    @ApiOperation(httpMethod = "GET", value = "逆变器详折线图上方统计", notes = "逆变器详折线图上方统计")
+    public ResponseModel<Map<String,Object>> jpInverterTotal( String time,String snCode,String thirdStationId,String date) {
 
-		return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterTotal(snCode,thirdStationId,time,date));
-	}
+        return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterTotal(snCode,thirdStationId,time,date));
+    }
 
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpInverterServiceImpl.java

@@ -94,7 +94,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         return this.getBaseMapper().selectPageDataTotal(jpInverterDto);
     }
 
-	public Map<String,Object> selectDayTrend(List<JSONObject>treeParams, String time, String snCode, String thirdStationId) {
+	public Map<String,Object> selectDayTrend(List<JSONObject>treeParams, String time, String time2, String snCode, String thirdStationId) {
         List<String> key = new ArrayList<>();
         treeParams.forEach(a->{
             if (a.get("key").toString().startsWith("acc")||a.get("key").toString().startsWith("acv")||a.get("key").toString().startsWith("pv")){
@@ -103,9 +103,13 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
                 key.add(a.get("key").toString());
             }
         });
-		List<Map<String,Object>> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectDayTrend(key, time, snCode, thirdStationId);
+		List<Map<String,Object>> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectDayTrend(key, time,time2, snCode, thirdStationId);
         List<String> zData = new ArrayList<>();
-        tdHYGFInverterDayGenerates.forEach(e->zData.add(e.get("workstatus").toString()) );
+        tdHYGFInverterDayGenerates.forEach(e-> {
+            if(e.get("workstatus") != null) {
+                zData.add(e.get("workstatus").toString());
+            }
+        } );
 		Set<String> xData = new TreeSet<>();
 		for (JSONObject treeParam : treeParams) {
 			List<String> value = new ArrayList<>();
@@ -370,8 +374,14 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         List<String> value2 = new ArrayList<>();
         List<Map<String, Object>> maps = tdHYGFInverterYearGenerateMapper.selectYearTrend(time, snCode, thirdStationId);
         for (Map<String, Object> map : maps) {
-            xData.add(map.get("daytime").toString());
-            value1.add(map.get("generate").toString());
+            if(map.get("daytime") != null) {
+                xData.add(map.get("daytime").toString());
+            }
+
+            if(map.get("generate") != null) {
+                value1.add(map.get("generate").toString());
+            }
+
             value2.add(map.get("fullhour") == null?"0":String.format("%.2f",Double.valueOf(map.get("fullhour").toString())));
         }
         List<Map<String, Object>> yData = new ArrayList<>();

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/json/paramsTree.json

@@ -2,7 +2,6 @@
   {
     "name": "直流电压",
     "key": "acv",
-    "unit": "V",
     "children": [
       {"name":"直流电压PV1",
        "key": "acv_1",
@@ -25,7 +24,6 @@
   {
     "name": "直流电流",
     "key": "acc",
-    "unit": "A",
     "children": [
       {"name":"直流电流PV1",
         "key": "acc_1",
@@ -47,7 +45,6 @@
   }, {
   "name": "直流功率",
   "key": "pv",
-  "unit": "kW",
   "children": [
     {"name":"直流功率PV1",
       "key": "pv_1",
@@ -145,21 +142,18 @@
   {
     "name": "直流母线电压",
     "key": "zlmxdy",
-    "unit": "V",
     "children": [
     ]
   },
   {
     "name": "直流母线半电压",
     "key": "zlmxbdy",
-    "unit": "V",
     "children": [
     ]
   },
   {
     "name": "绝缘阻抗实时值",
     "key": "jyzkssz",
-    "unit": "Ω",
     "children": [
     ]
   }