并网优化

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/GlobalExceptionHandler.java

@@ -56,6 +56,8 @@ public class GlobalExceptionHandler {
 			String stackTrace = sw.toString();
 			response.setDevMessage(stackTrace);
 			response.setMessage(stackTrace);
+			System.err.println(e.getMessage());
+			log.debug("Exception stack trace (debug mode): {}", stackTrace);
 		} else {
 			response.setDevMessage(e.getMessage());
 			response.setMessage(e.getMessage());

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/BasicGridRecordDto.java

@@ -71,4 +71,6 @@ public class BasicGridRecordDto  extends BaseDto {
 
 
  private String isAudit;
+
+ private Date gridTime;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/BasicGridRecord.java

@@ -81,4 +81,9 @@ public class BasicGridRecord extends BaseEntity {
 	@TableField("rectification_status")
     private String rectificationStatus;
 
+    /**
+     * 验收时间
+     */
+    @TableField("grid_time")
+    private Date gridTime;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/CommonResponseNewUtil.java

@@ -47,6 +47,15 @@ public class CommonResponseNewUtil
 		return res;
 	}
 
+	public static ResponseModel failureMessage(String message)
+	{
+		ResponseModel res = new ResponseModel();
+		res.setDevMessage(message);
+		res.setMessage(message);
+		res.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+		return res;
+	}
+
 	public static ResponseModel failure(Object obj, String message)
 	{
 		ResponseModel res = new ResponseModel();

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml

@@ -21,6 +21,7 @@
         hbga.work_order_power_station_id workOrderPowerStationId,
         hbga.peasant_household_id peasantHouseholdId,
         hbga.basic_grid_node basicGridNode,
+        hbga.grid_time gridTime,
         hbga.power_station_area_status powerStationAreaStatus,
         hbga.power_station_design_status powerStationDesignStatus,
         hbga.rectification_status rectificationStatus,
@@ -62,8 +63,11 @@
             <if test="map.projectAddress != null and map.projectAddress!=''">
                 AND hph.project_address_name LIKE concat(concat('%', #{map.projectAddress}), '%')
             </if>
-            <if test="map.powerStationCode != null and map.powerStationCode !=''">
-                AND hph.peasant_household_no LIKE concat(concat('%', #{map.powerStationCode}), '%')
+            <if test="map.basicGridNodes != null and map.basicGridNodes.size()>0  and map.type != null">
+                AND hbga.grid_node IN
+                <foreach collection="map.basicGridNodes" item="item" open="(" close=")" separator=",">
+                #{item}
+                </foreach>
             </if>
             <if test="map.ownersName != null and map.ownersName !=''">
                 AND hph.owners_name LIKE concat(concat('%', #{map.ownersName}), '%')
@@ -75,10 +79,6 @@
                 AND DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') = #{map.gridConnectionTime}
             </if>
         </where>
-        ORDER BY
-        FIELD(hbga.grid_status, '1', '2', '4', '3'),
-         hogaa.grid_connection_time desc, hbga.sequence_nbr desc
-
-
+        ORDER BY hbga.sequence_nbr desc
     </select>
 </mapper>

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridAcceptanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridRecordDto;
@@ -15,6 +18,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.HygfOnGridMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.BasicGridAcceptanceServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.WorkflowImpl;
+import com.yeejoin.amos.component.robot.BadRequest;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,10 +30,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  *
@@ -83,6 +84,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PostMapping(value = "/save/commit")
 	@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+	@Transactional
 	public ResponseModel saveAndCommit(@RequestBody  HygfOnGrid dto) {
 		return ResponseHelper.buildResponse(basicGridAcceptanceServiceImpl.saveAndCommit(dto,getUserId()));
 	}
@@ -145,14 +147,17 @@ public class BasicGridAcceptanceController extends BaseController {
 																	@RequestParam(required = false,value = "powerStationCode") String powerStationCode,
 																	@RequestParam(required = false,value = "ownersName") String ownersName,
 																	@RequestParam(required = false,value = "gridStatus") String gridStatus,
+																	@RequestParam(required = false,value = "type") String type,
 																	@RequestParam(required = false,value = "gridConnectionTime") String gridConnectionTime) throws Exception {
         //当前登录人所属场站
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 
 		ReginParams reginParams = getSelectedOrgInfo();
 		List<String> basicGridNodes = new ArrayList<>();
+		List<Long> roleIds = new ArrayList<>();
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
+			roleIds.addAll(longs);
 			if (longs.contains(areaId)) {
 				basicGridNodes.add("bw-area");
 			}
@@ -162,13 +167,18 @@ public class BasicGridAcceptanceController extends BaseController {
 			if (longs.contains(designId)) {
 				basicGridNodes.add("bw-design");
 			}
+			if (longs.contains(delerAdminId)) {
+				basicGridNodes.add("bw-design");
+				basicGridNodes.add("bw-engineering");
+				basicGridNodes.add("bw-area");
+			}
 		}
-	    Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "");
+	    Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "",basicGridNodes,type);
 		//根据角色及当前节点判断是否有操作权限
 		if (basicGridNodes != null){
 			for (BasicGridRecordDto e : page.getRecords()) {
 				for (String g : basicGridNodes) {
-					if (null != e.getBasicGridNode() && e.getBasicGridNode().contains(g)){
+					if (null != e.getBasicGridNode() && e.getBasicGridNode().contains(g) && (roleIds.contains(areaId) ||roleIds.contains(designId) ||  roleIds.contains(engineeringId))){
 						e.setIsAudit("0");
 						break;
 					}else {
@@ -176,7 +186,6 @@ public class BasicGridAcceptanceController extends BaseController {
 					}
 				}
 			}
-
 		}
 	    return ResponseHelper.buildResponse(page);
 	}
@@ -201,7 +210,7 @@ public class BasicGridAcceptanceController extends BaseController {
 																	@RequestParam(required = false,value = "gridConnectionTime") String gridConnectionTime) throws Exception {
         //当前登录人所属场站
 
-        Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check");
+        Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check",null,null);
 		return ResponseHelper.buildResponse(page);
 	}
 
@@ -238,6 +247,7 @@ public class BasicGridAcceptanceController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "完工自审-经销商管理",   notes = "完工自审经销商管理")
 	@PostMapping(value = "/completeAdminAudit")
+	@Transactional
 	public ResponseModel completeAdminAudit( @RequestBody Map<String,String> kv) {
 		basicGridAcceptanceServiceImpl.completeAdminAudit(kv);
 		return ResponseHelper.buildResponse(null);
@@ -246,27 +256,31 @@ public class BasicGridAcceptanceController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "完工自审管理审核",   notes = "完工自审管理审核")
 	@PostMapping(value = "/completeAudit")
+	@Transactional
 	public ResponseModel completeAudit( @RequestBody Map<String,String> kv) {
-		basicGridAcceptanceServiceImpl.completeAudit(kv);
-		return ResponseHelper.buildResponse(null);
+		return	basicGridAcceptanceServiceImpl.completeAudit(kv);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "整改单下发",   notes = "整改单下发")
 	@PostMapping(value = "/addRectification")
+	@Transactional
 	public ResponseModel addRectification( @RequestBody HygfRectificationOrder hygfReplenishment) {
 
-		basicGridAcceptanceServiceImpl.addRectification(hygfReplenishment);
-		return ResponseHelper.buildResponse(null);
+
+
+		return	basicGridAcceptanceServiceImpl.addRectification(hygfReplenishment);
+
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "POST",value = "整改单添加信息",   notes = "整改单添加信息")
 	@PostMapping(value = "/nextTaskExcute")
+	@Transactional
 	public ResponseModel nextTaskExcute( @RequestBody HygfRectificationOrder hygfReplenishment) {
 
-		basicGridAcceptanceServiceImpl.nextTaskExcute(hygfReplenishment);
-		return ResponseHelper.buildResponse(null);
+
+		return basicGridAcceptanceServiceImpl.nextTaskExcute(hygfReplenishment);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -275,17 +289,18 @@ public class BasicGridAcceptanceController extends BaseController {
 	@Transactional
 	public ResponseModel nextTaskAduit( @RequestBody HygfRectificationOrder hygfReplenishment) {
 
-		basicGridAcceptanceServiceImpl.nextTaskAduit(hygfReplenishment);
-		return ResponseHelper.buildResponse(null);
+
+		return	basicGridAcceptanceServiceImpl.nextTaskAduit(hygfReplenishment);
 	}
 
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "PUT",value = "整改单作废",   notes = "整改单作废")
 	@PutMapping(value = "/rollback")
+	@Transactional
 	public ResponseModel rollback( @RequestParam(value = "sequenceNbr") Long sequenceNbr) {
 
-		basicGridAcceptanceServiceImpl.rollback(sequenceNbr);
-		return ResponseHelper.buildResponse(null);
+
+		return basicGridAcceptanceServiceImpl.rollback(sequenceNbr);
 	}
 
 

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

@@ -202,11 +202,11 @@ public class HygfRectificationOrderController extends BaseController {
 		for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
 			List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
 			page.getRecords().forEach(e->{
-				if (longs.contains(areaId) && e.getRectificationSource().equals("bw-area")){
+				if (longs.contains(areaId) && e.getRectificationSource().equals("bw-area") && e.getRectificationSource().equals(rectificationSource)){
 					e.setIsAudit("0");
-				}else if (longs.contains(engineeringId) && e.getRectificationSource().equals("bw-engineering")){
+				}else if (longs.contains(engineeringId) && e.getRectificationSource().equals("bw-engineering")&& e.getRectificationSource().equals(rectificationSource)){
 					e.setIsAudit("0");
-				}else if (longs.contains(designId) && e.getRectificationSource().equals("bw-design")){
+				}else if (longs.contains(designId) && e.getRectificationSource().equals("bw-design")&& e.getRectificationSource().equals(rectificationSource)){
 					e.setIsAudit("0");
 				}else if (longs.contains(delerKfId)){
 					e.setIsAudit("0");

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

@@ -201,7 +201,7 @@ public class WorkOrderController extends BaseController {
         List<Long> roleIds = new ArrayList<>();
         for (Long aLong : reginParams.getUserModel().getOrgRoleSeqs().keySet()) {
             List<Long> longs = reginParams.getUserModel().getOrgRoleSeqs().get(aLong);
-            roleIds.addAll(roleIds);
+
             if (longs.contains(areaId)) {
                 workOrderPowerStationNodes.add("area");
             }
@@ -216,6 +216,7 @@ public class WorkOrderController extends BaseController {
                 workOrderPowerStationNodes.add("engineering");
                 workOrderPowerStationNodes.add("area");
             }
+            roleIds.addAll(longs);
         }
         if (workOrder.getType().equals("3") && workOrderPowerStationNodes != null){
             workOrder.setWorkOrderPowerStationNodes(workOrderPowerStationNodes);