Skip to content

A
amos-boot-biz
Commit 9685838f authored by chenzhao's avatar chenzhao
Browse files
Options

Merge remote-tracking branch 'origin/dev0124_beta' into dev0124

# Conflicts: # amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java
parents e2fb2f89 8701337d
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 54 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java
View file @ 9685838f
......@@ -34,9 +34,13 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
@UserEmpower(field ={"ORG_CODE"} ,dealerField ={"ORG_CODE"}, fieldConditions ={"eq","in","in"} ,relationship="and",specific=false)
List<DropDown> getRegion();
List<DropDown> getRegionAll();
@UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={"hygf_unit_info.amos_company_code","hygf_regional_companies.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
List<DropDown> getDealer(@Param("regionalCompaniesCode") String regionalCompaniesCode);
List<DropDown> getDealerAll(@Param("regionalCompaniesCode") String regionalCompaniesCode);
@UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
JpStationDto getCountJpStationdata(@Param("dto") JpStationDto reviewDto);
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/MaintenanceMapper.java
View file @ 9685838f
......@@ -36,7 +36,8 @@ public interface MaintenanceMapper extends BaseMapper<Maintenance> {
List<MaintenanceDto> Maintenancepage(@Param("name")String name, @Param("maintenanceTypeCode")String maintenanceTypeCode,
@Param("lockStatus")String lockStatus, @Param("reviewStatus")String reviewStatus,
@Param("regionalCompaniesSeq")Long regionalCompaniesSeq, @Param("dealerId") Long dealerId,@Param("maintenanceType")String maintenanceType,
@Param("maintenanceAreaAddress")String maintenanceAreaAddress);
@Param("maintenanceAreaAddress")String maintenanceAreaAddress,
@Param("regionalCompaniesCode")String regionalCompaniesCode, @Param("dealerCode") String dealerCode);
//详情
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml
View file @ 9685838f
......@@ -248,6 +248,12 @@
FROM privilege_company
WHERE IS_DELETED=0 and privilege_company.COMPANY_TYPE = 'region'
</select>
<select id="getRegionAll" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
SELECT privilege_company.ORG_CODE orgCode ,
privilege_company.COMPANY_NAME name
FROM privilege_company
WHERE IS_DELETED=0 and privilege_company.COMPANY_TYPE = 'region'
</select>
<select id="getDealer" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
SELECT hygf_unit_info.`name`, hygf_unit_info.amos_company_code orgCode FROM hygf_regional_companies LEFT JOIN hygf_unit_info
......@@ -260,6 +266,17 @@
GROUP BY hygf_unit_info.amos_company_code,hygf_unit_info.`name`
</select>
<select id="getDealerAll" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
SELECT hygf_unit_info.`name`, hygf_unit_info.amos_company_code orgCode FROM hygf_regional_companies LEFT JOIN hygf_unit_info
ON hygf_unit_info.sequence_nbr=hygf_regional_companies.unit_info_id WHERE hygf_unit_info.audit_status='2'
AND hygf_unit_info.blacklist='0' AND hygf_unit_info.is_delete='0'
<if test="regionalCompaniesCode!=null">
and hygf_regional_companies.regional_companies_code =#{regionalCompaniesCode}
</if>
and hygf_unit_info.amos_company_code is not null
GROUP BY hygf_unit_info.amos_company_code,hygf_unit_info.`name`
</select>
<select id="getDealerNew" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
SELECT hygf_unit_info.`name`, hygf_unit_info.sequence_nbr orgCode
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/MaintenanceMapper.xml
View file @ 9685838f
......@@ -53,9 +53,8 @@
std_user_biz.id_card_opposite idCardOpposite,
std_user_biz.amos_org_code amosDealerCode,
std_user_biz.amos_id amosDealerId
from hygf_maintenance ph LEFT JOIN std_user_biz on ph.foundation_id=std_user_biz.sequence_nbr
LEFT JOIN hygf_unit_info on hygf_unit_info.sequence_nbr = ph.dealer_id
<where>
ph.is_delete = 0
......@@ -78,17 +77,21 @@
<if test="reviewStatus != null and reviewStatus != ''">
AND ph.review_status = #{reviewStatus}
</if>
<if test="regionalCompaniesSeq != null and regionalCompaniesSeq != ''">
AND ph.regional_companies_seq = #{regionalCompaniesSeq}
</if>
<if test="regionalCompaniesCode != null and regionalCompaniesCode != ''">
AND ph.regional_companies_code = #{regionalCompaniesCode}
</if>
<if test="dealerId != null and dealerId != ''">
AND ph.dealer_id = #{dealerId}
</if>
<if test="dealerCode != null and dealerCode != ''">
AND hygf_unit_info.amos_company_code = #{dealerCode}
</if>
</where>
order by ph.rec_date desc
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java
View file @ 9685838f
......@@ -414,6 +414,22 @@ public class JpStationController extends BaseController {
return ResponseHelper.buildResponse(result);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "查询当前登录人权限区域公司", notes = "查询当前登录人权限区域公司")
@GetMapping(value = "/getRegionAll")
public ResponseModel<List<Map<String, String>>> getRegionAll() {
List<DropDown> list = jpStationMapper.getRegionAll();
List<Map<String, String>> result = new ArrayList<>();
list.forEach(dropDown -> {
Map<String, String> item = new HashMap<>();
item.put("text", dropDown.getName());
item.put("value", dropDown.getOrgCode());
result.add(item);
});
return ResponseHelper.buildResponse(result);
}
//查询当前登录人权限经销商
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -432,6 +448,21 @@ public class JpStationController extends BaseController {
return ResponseHelper.buildResponse(result);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "查询当前登录人权限经销商", notes = "查询当前登录人权限经销商")
@GetMapping(value = "/getDealerAll")
public ResponseModel<List<Map<String, String>>> getDealerAll(String regionalCompaniesCode) {
List<DropDown> list = jpStationMapper.getDealerAll(regionalCompaniesCode);
List<Map<String, String>> result = new ArrayList<>();
list.forEach(dropDown -> {
Map<String, String> item = new HashMap<>();
item.put("text", dropDown.getName());
item.put("value", dropDown.getOrgCode());
result.add(item);
});
return ResponseHelper.buildResponse(result);
}
//电站发电量统计
@TycloudOperation(ApiLevel = UserType.AGENCY)
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/MaintenanceController.java
View file @ 9685838f
......@@ -25,7 +25,9 @@ import com.yeejoin.amos.boot.module.hygf.biz.service.impl.MaintenanceServiceImpl
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto;
......@@ -50,6 +52,7 @@ public class MaintenanceController extends BaseController {
@Autowired
MaintenanceMapper maintenanceMapper;
/**
* 新增运维人员
*
......@@ -72,7 +75,7 @@ public class MaintenanceController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新运维人员", notes = "根据sequenceNbr更新运维人员")
public ResponseModel<MaintenanceDto> updateBySequenceNbrMaintenance(@RequestBody MaintenanceDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
public ResponseModel<MaintenanceDto> updateBySequenceNbrMaintenance(@RequestBody MaintenanceDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(maintenanceServiceImpl.updateWithModel(model));
}
......@@ -86,20 +89,20 @@ public class MaintenanceController extends BaseController {
@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){
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(maintenanceServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个运维人员", notes = "根据sequenceNbr查询单个运维人员")
public ResponseModel<Map<String,Object> > selectOne(@PathVariable Long sequenceNbr) {
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个运维人员", notes = "根据sequenceNbr查询单个运维人员")
public ResponseModel<Map<String, Object>> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(maintenanceServiceImpl.selectOneById(sequenceNbr));
}
......@@ -112,68 +115,64 @@ public class MaintenanceController extends BaseController {
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "运维人员分页查询", notes = "运维人员分页查询")
public ResponseModel<Page<MaintenanceDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
@ApiOperation(httpMethod = "GET", value = "运维人员分页查询", notes = "运维人员分页查询")
public ResponseModel<Page<MaintenanceDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size,
@RequestParam(required = false) String name,
@RequestParam(required = false)String maintenanceTypeCode,
@RequestParam(required = false)String maintenanceType,
@RequestParam(required = false) String lockStatus,
@RequestParam(required = false)String reviewStatus,
@RequestParam(required = false)Long regionalCompaniesSeq,
@RequestParam(required = false)Long dealerId,
@RequestParam(required = false)String maintenanceAreaAddress
) {
return ResponseHelper.buildResponse(maintenanceServiceImpl.queryForMaintenancePage( current, size, name, maintenanceTypeCode,lockStatus,reviewStatus,regionalCompaniesSeq,dealerId,maintenanceType,maintenanceAreaAddress));
@RequestParam(required = false) String name,
@RequestParam(required = false) String maintenanceTypeCode,
@RequestParam(required = false) String maintenanceType,
@RequestParam(required = false) String lockStatus,
@RequestParam(required = false) String reviewStatus,
@RequestParam(required = false) Long regionalCompaniesSeq,
@RequestParam(required = false) Long dealerId,
@RequestParam(required = false) String maintenanceAreaAddress,
@RequestParam(required = false) String regionalCompaniesCode,
@RequestParam(required = false) String dealerCode
) {
return ResponseHelper.buildResponse(maintenanceServiceImpl.queryForMaintenancePage(current, size, name, maintenanceTypeCode, lockStatus, reviewStatus, regionalCompaniesSeq, dealerId, maintenanceType, maintenanceAreaAddress,regionalCompaniesCode,dealerCode));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping (value = "examine/{sequenceNbr}")
@ApiOperation(httpMethod = "post",value = "审核单个运维人员", notes = "审核单个运维人员")
public ResponseModel<Maintenance> examine(@PathVariable Long sequenceNbr,@RequestBody MaintenanceLog maintenanceLog) {
return ResponseHelper.buildResponse(maintenanceServiceImpl.examine(sequenceNbr,maintenanceLog));
@PostMapping(value = "examine/{sequenceNbr}")
@ApiOperation(httpMethod = "post", value = "审核单个运维人员", notes = "审核单个运维人员")
public ResponseModel<Maintenance> examine(@PathVariable Long sequenceNbr, @RequestBody MaintenanceLog maintenanceLog) {
return ResponseHelper.buildResponse(maintenanceServiceImpl.examine(sequenceNbr, maintenanceLog));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "运维人员列表全部数据查询", notes = "运维人员列表全部数据查询")
@ApiOperation(httpMethod = "GET", value = "运维人员列表全部数据查询", notes = "运维人员列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<MaintenanceDto>> selectForList(
@RequestParam(required = false) String name, //运维人员类型
@RequestParam(required = false)String maintenanceType //运维人员类型code
@RequestParam(required = false) String maintenanceType //运维人员类型code
) {
return ResponseHelper.buildResponse(maintenanceServiceImpl.queryList(
name, //运维人员类型
name, //运维人员类型
maintenanceType //运维人员类型code
));
}
//查询当前登录人权限经销商
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET",value = "查询当前登录人权限经销商", notes = "查询当前登录人权限经销商")
@ApiOperation(httpMethod = "GET", value = "查询当前登录人权限经销商", notes = "查询当前登录人权限经销商")
@GetMapping(value = "/getDealer")
public ResponseModel<List<Map<String,String>>> getDealer(String regionalCompaniesCode ) {
List<DropDown> list= jpStationMapper.getDealerNew(regionalCompaniesCode);
List<Map<String,String>> result = new ArrayList<>();
public ResponseModel<List<Map<String, String>>> getDealer(String regionalCompaniesCode) {
List<DropDown> list = jpStationMapper.getDealerNew(regionalCompaniesCode);
List<Map<String, String>> result = new ArrayList<>();
list.forEach(dropDown -> {
Map<String,String> item = new HashMap<>();
item.put("text",dropDown.getName());
item.put("value",dropDown.getOrgCode());
Map<String, String> item = new HashMap<>();
item.put("text", dropDown.getName());
item.put("value", dropDown.getOrgCode());
result.add(item);
});
return ResponseHelper.buildResponse(result);
......@@ -182,16 +181,16 @@ public class MaintenanceController extends BaseController {
//查询当前登录人权限经销商
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "经销商人员加入黑名单/撤销黑名单", notes = "经销商人员加入黑名单/撤销黑名单")
@ApiOperation(httpMethod = "GET", value = "经销商人员加入黑名单/撤销黑名单", notes = "经销商人员加入黑名单/撤销黑名单")
@GetMapping(value = "/updateUser")
public ResponseModel<Object> updateUser(Long sequenceNbr ,String type) {
maintenanceServiceImpl.updateUser( sequenceNbr , type);
public ResponseModel<Object> updateUser(Long sequenceNbr, String type) {
maintenanceServiceImpl.updateUser(sequenceNbr, type);
return ResponseHelper.buildResponse(null);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "签订安全协议", notes = "签订安全协议")
@ApiOperation(httpMethod = "GET", value = "签订安全协议", notes = "签订安全协议")
@GetMapping(value = "/updateAgreement")
public ResponseModel<Object> updateTrainingAgreement(String userId) {
maintenanceServiceImpl.updateTrainingAgreement(userId);
......@@ -199,13 +198,24 @@ public class MaintenanceController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "验证安全签订安全协议是否签订", notes = "验证安全签订安全协议是否签订")
@ApiOperation(httpMethod = "GET", value = "验证安全签订安全协议是否签订", notes = "验证安全签订安全协议是否签订")
@GetMapping(value = "/getTrainingAgreement")
public ResponseModel<String> getTrainingAgreement(String userId) {
MaintenanceDto maintenanceDto=maintenanceMapper.getTrainingAgreement(userId);
if(maintenanceDto.getIsSignAnAgreement()!=null&&maintenanceDto.getIsSignAnAgreement()==1){
MaintenanceDto maintenanceDto = maintenanceMapper.getTrainingAgreement(userId);
if (maintenanceDto.getIsSignAnAgreement() != null && maintenanceDto.getIsSignAnAgreement() == 1) {
return ResponseHelper.buildResponse("true");
}
return ResponseHelper.buildResponse("false");
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "验证是否完成培训及培训", notes = "验证是否完成培训及培训")
@GetMapping(value = "/getTrainingStatus")
public ResponseModel<Boolean> getTrainingStatus(String userId) {
MaintenanceDto maintenanceDto = maintenanceMapper.getTrainingAgreement(userId);
if (maintenanceDto.getIsSignAnAgreement() != null && maintenanceDto.getTrainingStatus().equals("已培训")) {
return ResponseHelper.buildResponse(Boolean.TRUE);
}
return ResponseHelper.buildResponse(Boolean.FALSE);
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/emqx/MaintenanceResultHandlerMessage.java
View file @ 9685838f
......@@ -77,7 +77,7 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
Long warningId = specialMap.containsKey("warningId") ? Long.valueOf(specialMap.get("warningId").toString()) : 0L;
if(warningId>0){
List<HYGFMaintenanceTickets> hygfMaintenanceTicketsList = hygfMaintenanceTicketsMapper.selectList(new QueryWrapper<HYGFMaintenanceTickets>().eq("warning_id", warningId).eq("handler_status","未处理"));
if (hygfMaintenanceTicketsList.size()>0) {
if (hygfMaintenanceTicketsList.size()==1) {
return;
}
}
......@@ -88,7 +88,7 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
jpStation = jpStationMapper.selectById(stationid);
}
TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(warningId, sncode, stationid);
// hygfMaintenanceTickets.setHandlerStatus("未处理");
hygfMaintenanceTickets.setHandlerStatus("未处理");
MaintenanceDto maintenance = maintenanceMapper.selectOneById(Long.valueOf(mantainancePersonId));
hygfMaintenanceTickets.setStationId(stationid);
hygfMaintenanceTickets.setWarningId(warningId);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/MaintenanceServiceImpl.java
View file @ 9685838f
......@@ -88,10 +88,10 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
* 分页查询
*/
public Page<MaintenanceDto> queryForMaintenancePage( int current,int size,String name, String maintenanceTypeCode, String lockStatus, String reviewStatus,Long regionalCompaniesSeq, Long dealerId
,String maintenanceType,String maintenanceAreaAddress) {
,String maintenanceType,String maintenanceAreaAddress,String regionalCompaniesCode, String dealerCode) {
PageHelper.startPage(current, size);
List<MaintenanceDto> resultPage = maintenanceMapper.Maintenancepage( name, maintenanceTypeCode, lockStatus, reviewStatus, regionalCompaniesSeq, dealerId,maintenanceType,maintenanceAreaAddress);
List<MaintenanceDto> resultPage = maintenanceMapper.Maintenancepage( name, maintenanceTypeCode, lockStatus, reviewStatus, regionalCompaniesSeq, dealerId,maintenanceType,maintenanceAreaAddress,regionalCompaniesCode,dealerCode);
PageInfo<MaintenanceDto> page = new PageInfo(resultPage);
Page<MaintenanceDto> pagenew = new Page<MaintenanceDto>();
pagenew.setCurrent(current);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment