Skip to content

A
amos-boot-biz
Commit 99c595c3 authored by chenzhao's avatar chenzhao
Browse files
Options

Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

parents 8e4595a4 dc902d65
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1047 additions and 69 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/TaskTypeStationEnum.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public enum TaskTypeStationEnum {
经销商审核("经销商审核", "经销商审核"),
电站勘察("电站勘察", "电站勘察"),
电站审核("电站审核", "电站审核"),
合同填报("合同填报", "合同填报");
/**
* 名称，描述
*/
private String name;
/**
* 编码
*/
private String code;
public static TaskTypeStationEnum getNodeByCode(String code) {
TaskTypeStationEnum taskTypeStationEnum = null;
for(TaskTypeStationEnum type: TaskTypeStationEnum.values()) {
if (type.getCode().equals(code)) {
taskTypeStationEnum = type;
break;
}
}
return taskTypeStationEnum;
}
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PeasantHouseholdDto.java
View file @ 99c595c3
......@@ -100,6 +100,8 @@ public class PeasantHouseholdDto extends BaseDto {
@ApiModelProperty(value = "开发人")
@NotBlank(message = "开发人不能为空")
private String developer;
@ApiModelProperty(value = "开发人userid")
private String developerUserId;
@ApiModelProperty(value = "常住地址")
private String permanentAddressName;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PreparationMoneyDto.java
View file @ 99c595c3
......@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoneyLog;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/TasksRole.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.api.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: tw
* @createDate: 2023/9/11
*/
@Data
public class TasksRole {
@ApiModelProperty(value = "用户id")
private String amosUserId;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/ToDoTasksDto.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 人员任务
*
* @author system_generator
* @date 2023-09-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="ToDoTasksDto", description="人员任务")
public class ToDoTasksDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "任务类型")
private String type;
@ApiModelProperty(value = "业务id")
private Long businessId;
@ApiModelProperty(value = "任务状态")
private String state;
@ApiModelProperty(value = "用户id")
private String amosUserId;
@ApiModelProperty(value = " 任务创建时间")
private Date creationTime;
@ApiModelProperty(value = "完成时间")
private Date completeTime;
@ApiModelProperty(value = "任务名称")
private String taskName;
/**
*经销商orgCode
*/
@ApiModelProperty(value = "经销商orgCode")
private String amosOrgCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/ToDoTasksPageDto.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.hygf.api.entity.ToDoTasks;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @description:
* @author: tw
* @createDate: 2023/8/21
*/
@Data
public class ToDoTasksPageDto extends Page<ToDoTasks> {
@ApiModelProperty(value = "任务类型")
private String type;
@ApiModelProperty(value = "任务状态")
private String state;
@ApiModelProperty(value = "用户id")
private String amosUserId;
@ApiModelProperty(value = " 任务创建时间")
private Date creationTime;
@ApiModelProperty(value = "完成时间")
private Date completeTime;
@ApiModelProperty(value = "任务名称")
private String taskName;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UserMessageDto.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.api.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 人员消息
*
* @author system_generator
* @date 2023-09-12
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value="UserMessageDto", description="人员消息")
public class UserMessageDto extends BaseDto {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "任务类型")
private String type;
@ApiModelProperty(value = "业务id")
private Long businessId;
@ApiModelProperty(value = "用户id")
private String amosUserId;
@ApiModelProperty(value = " 消息创建时间")
private Date creationTime;
@ApiModelProperty(value = "消息内容")
private String taskName;
@ApiModelProperty(value = "经销商orgCode")
private String amosOrgCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PeasantHousehold.java
View file @ 99c595c3
......@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -139,6 +140,9 @@ public class PeasantHousehold extends BaseEntity {
* */
@TableField("developer")
private String developer;
@TableField("developer_user_id")
private String developerUserId;
/*
* 区域公司id
* */
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/ToDoTasks.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 人员任务
*
* @author system_generator
* @date 2023-09-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("hygf_to_do_tasks")
public class ToDoTasks extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 任务类型
*/
@TableField("type")
private String type;
/**
* 业务id
*/
@TableField("business_id")
private Long businessId;
/**
* 任务状态
*/
@TableField("state")
private String state;
/**
* 用户id
*/
@TableField("amos_user_id")
private String amosUserId;
/**
* 任务创建时间
*/
@TableField("creation_time")
private Date creationTime;
/**
* 完成时间
*/
@TableField("complete_time")
private Date completeTime;
/**
* 任务名称
*/
@TableField("task_name")
private String taskName;
/**
*经销商orgCode
*/
@TableField("amos_org_code")
private String amosOrgCode;
public ToDoTasks(String type, Long businessId, String taskName,String orgCode) {
this.type = type;
this.businessId = businessId;
this.state = "待办";
this.amosOrgCode = orgCode;
this.creationTime = new Date();
this.taskName = taskName;
}
public ToDoTasks() {
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/UserMessage.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 人员消息
*
* @author system_generator
* @date 2023-09-12
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("hygf_user_message")
public class UserMessage extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 任务类型
*/
@TableField("type")
private String type;
/**
* 业务id
*/
@TableField("business_id")
private Long businessId;
/**
* 用户id
*/
@TableField("amos_user_id")
private String amosUserId;
/**
* 消息创建时间
*/
@TableField("creation_time")
private Date creationTime;
/**
* 消息内容
*/
@TableField("task_name")
private String taskName;
/**
* 经销商orgCode
*/
@TableField("amos_org_code")
private String amosOrgCode;
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/ToDoTasksMapper.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.api.mapper;
import com.yeejoin.amos.boot.module.hygf.api.dto.TasksRole;
import com.yeejoin.amos.boot.module.hygf.api.entity.ToDoTasks;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 人员任务 Mapper 接口
*
* @author system_generator
* @date 2023-09-08
*/
public interface ToDoTasksMapper extends BaseMapper<ToDoTasks> {
List<TasksRole> getTasksRole(@Param("roleId")String roleId,@Param("orgCode")String orgCode);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/UserMessageMapper.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.api.mapper;
import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 人员消息 Mapper 接口
*
* @author system_generator
* @date 2023-09-12
*/
public interface UserMessageMapper extends BaseMapper<UserMessage> {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IToDoTasksService.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.api.service;
import com.yeejoin.amos.boot.module.hygf.api.entity.ToDoTasks;
import io.swagger.annotations.ApiModelProperty;
/**
* 人员任务接口类
*
* @author system_generator
* @date 2023-09-08
*/
public interface IToDoTasksService {
public void addToDoTasksByUserId(String userId, ToDoTasks toDoTasks);
public void addToDoTasksByRole(String role, ToDoTasks toDoTasks);
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IUserMessageService.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.api.service;
/**
* 人员消息接口类
*
* @author system_generator
* @date 2023-09-12
*/
public interface IUserMessageService {
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/PersonnelBusinessMapper.xml
View file @ 99c595c3
......@@ -54,12 +54,12 @@ select ORG_CODE orgCode from privilege_company where privilege_company.SEQUEN
</select>
<select id="getCompanyDtoUserDtopage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto">
<select id="getUserUnitInformationDto" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto">
SELECT
hygf_personnel_business.regional_companies_seq regionalCompaniesSeq ,
hygf_personnel_business.regional_companies_code regionalCompaniesName ,
hygf_personnel_business.regional_companies_name regionalCompaniesCode ,
hygf_personnel_business.regional_companies_code regionalCompaniesCode ,
hygf_personnel_business.regional_companies_name regionalCompaniesName ,
hygf_personnel_business.amos_unit_id amosUnitId ,
hygf_personnel_business.amos_unit_name amosUnitName ,
......@@ -75,7 +75,8 @@ select ORG_CODE orgCode from privilege_company where privilege_company.SEQUEN
LEFT JOIN privilege_company on privilege_company.SEQUENCE_NBR=hygf_personnel_business.amos_dealer_id
WHERE std_user_biz.amos_user_id==#{id}
WHERE std_user_biz.amos_user_id=#{userId}
</select>
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/ToDoTasksMapper.xml 0 → 100644
View file @ 99c595c3
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.ToDoTasksMapper">
<select id="getTasksRole" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.TasksRole">
select
privilege_user_org_role.USER_ID amosUserId
from privilege_user_org_role
LEFT JOIN privilege_agency_user on privilege_agency_user.USER_ID=privilege_user_org_role.USER_ID
LEFT JOIN privilege_company on privilege_company.SEQUENCE_NBR =privilege_user_org_role.COMPANY_SEQ
where privilege_user_org_role.AGENCY_CODE='JXIOP' and privilege_agency_user.IS_DELETED=0 and privilege_agency_user.LOCK_STATUS='UNLOCK'
and privilege_user_org_role.ROLE_SEQ=#{roleId}
<if test="orgCode!=null">
and privilege_company.ORG_CODE like concat(#{orgCode},"%")
</if>
ORDER BY privilege_agency_user.USER_ID DESC
</select>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/UserMessageMapper.xml 0 → 100644
View file @ 99c595c3
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.UserMessageMapper">
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HouseholdContractController.java
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
import com.yeejoin.amos.boot.module.hygf.api.entity.ToDoTasks;
import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.ToDoTasksMapper;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PeasantHouseholdServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ToDoTasksServiceImpl;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
......@@ -51,7 +61,18 @@ public class HouseholdContractController extends BaseController {
@Autowired
QiyuesuoServiceImpl qiyuesuoServiceImpl;
@Autowired
ToDoTasksServiceImpl toDoTasksServiceImpl;
@Autowired
PeasantHouseholdServiceImpl peasantHouseholdServiceImpl;
@Value("${dealer.engineering}")
private String engineering;
@Autowired
PersonnelBusinessMapper personnelBusinessMapper;
@Autowired
ToDoTasksMapper toDoTasksMapper;
/**
* 新增
*
......@@ -125,7 +146,16 @@ public class HouseholdContractController extends BaseController {
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<IPage< HouseholdContract > > queryForPage(HouseholdContractPageDto dto) {
return ResponseHelper.buildResponse(householdContractServiceImpl.queryForPreparationMoneyPage(dto));
//获取用户所在经销商单位
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(getUserId());
if(userUnitInformationDto!=null&&userUnitInformationDto.getAmosDealerId()!=null){
dto.setDealerId(userUnitInformationDto.getAmosDealerId());
}
return ResponseHelper.buildResponse(householdContractServiceImpl.queryForPreparationMoneyPage(dto));
}
/**
......@@ -159,6 +189,12 @@ public class HouseholdContractController extends BaseController {
HouseholdContract householdContrac= householdContractServiceImpl.getById(sequenceNbr);
householdContrac.setSignStatus(HouseholdContractEnum.签字状态_已签字.getCode());
householdContrac.setStatus(HouseholdContractEnum.合同状态_农户已签署.getCode());
//生成填报任务
ToDoTasks toDoTasks1= new ToDoTasks ( TaskTypeStationEnum.合同填报.getCode(), householdContrac.getSequenceNbr(), TaskTypeStationEnum.合同填报.getCode(),householdContrac.getDealerCode());
toDoTasksServiceImpl.addToDoTasksByRole(engineering,toDoTasks1);
return ResponseHelper.buildResponse(householdContractServiceImpl.updateById(householdContrac));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
......@@ -166,28 +202,69 @@ public class HouseholdContractController extends BaseController {
@ApiOperation(httpMethod = "Post", value = "盖章", notes = "盖章")
public ResponseModel<Boolean> stamp(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(this.stampdata(sequenceNbr));
}
@Transactional
public boolean stampdata(Long sequenceNbr){
HouseholdContract householdContrac= householdContractServiceImpl.getById(sequenceNbr);
householdContrac.setStampStatus(HouseholdContractEnum.盖章状态_已盖章.getCode());
householdContrac.setSigningTime(new Date());
householdContrac.setStatus(HouseholdContractEnum.合同状态_双方已签署.getCode());
householdContrac.setSealedUser(getUserInfo().getRealName());
return ResponseHelper.buildResponse(householdContractServiceImpl.updateById(householdContrac));
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.合同填报.getCode());
wrapper.eq(ToDoTasks::getState, "待办");
wrapper.eq(ToDoTasks::getBusinessId, householdContrac.getSequenceNbr());
ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
if(doTasks!=null){
doTasks.setState("已办");
doTasks.setCompleteTime(new Date());
toDoTasksMapper.updateById(doTasks);
}
return householdContractServiceImpl.updateById(householdContrac);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping (value = "/cancel/{sequenceNbr}")
@ApiOperation(httpMethod = "Post", value = "作废", notes = "作废")
public ResponseModel<Boolean> cancel(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(this.canceldata(sequenceNbr));
}
@Transactional
public boolean canceldata(Long sequenceNbr){
HouseholdContract householdContrac= householdContractServiceImpl.getById(sequenceNbr);
householdContrac.setStatus(HouseholdContractEnum.合同状态_已作废.getCode());
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.合同填报.getCode());
wrapper.eq(ToDoTasks::getState, "待办");
wrapper.eq(ToDoTasks::getBusinessId, householdContrac.getSequenceNbr());
ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
if(doTasks!=null){
doTasks.setState("作废");
toDoTasksMapper.updateById(doTasks);
}
return householdContractServiceImpl.updateById(householdContrac);
return ResponseHelper.buildResponse(householdContractServiceImpl.updateById(householdContrac));
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/sealId/tree")
@ApiOperation(httpMethod = "GET", value = "印章", notes = "印章")
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PeasantHouseholdWxController.java
View file @ 99c595c3
......@@ -3,9 +3,11 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.alibaba.fastjson.JSONArray;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.MobileLoginParamDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.PeasantHouseholdWxDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.ToDoTasks;
import com.yeejoin.amos.boot.module.hygf.api.service.IWxService;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PeasantHouseholdServiceImpl;
......@@ -164,6 +166,7 @@ public class PeasantHouseholdWxController extends BaseController {
}
}
PeasantHouseholdDto result = peasantHouseholdServiceImpl.savePeasantHousehold(model, userInfo);
return ResponseHelper.buildResponse(result);
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PersonnelBusinessController.java
View file @ 99c595c3
......@@ -208,7 +208,7 @@ public class PersonnelBusinessController extends BaseController {
public ResponseModel<UserDataDto> czPassword(String id) {
PublicAgencyUser publicAgencyUser= publicAgencyUserMapper.selectById(id);
FeignClientResult<List<String>> data=Privilege.agencyUserClient.restorePassword(publicAgencyUser.getAmosUserId());
FeignClientResult data=Privilege.agencyUserClient.restorePassword(publicAgencyUser.getAmosUserId());
if(data==null||data.getResult()==null){
throw new BadRequest("修改状态失败！");
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/ToDoTasksController.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.module.hygf.api.dto.ToDoTasksPageDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
import com.yeejoin.amos.boot.module.hygf.api.entity.ToDoTasks;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ToDoTasksServiceImpl;
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.ToDoTasksDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
* 人员任务
*
* @author system_generator
* @date 2023-09-08
*/
@RestController
@Api(tags = "人员任务Api")
@RequestMapping(value = "/to-do-tasks")
public class ToDoTasksController extends BaseController {
@Autowired
ToDoTasksServiceImpl toDoTasksServiceImpl;
/**
* 新增人员任务
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增人员任务", notes = "新增人员任务")
public ResponseModel<ToDoTasksDto> save(@RequestBody ToDoTasksDto model) {
model = toDoTasksServiceImpl.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<ToDoTasksDto> updateBySequenceNbrToDoTasks(@RequestBody ToDoTasksDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(toDoTasksServiceImpl.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(toDoTasksServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个人员任务", notes = "根据sequenceNbr查询单个人员任务")
public ResponseModel<ToDoTasksDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(toDoTasksServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "人员任务分页查询", notes = "人员任务分页查询")
public ResponseModel<IPage<ToDoTasks>> queryForPage(ToDoTasksPageDto toDoTasksPageDto) {
toDoTasksPageDto.setAmosUserId(getUserInfo().getUserId());
return ResponseHelper.buildResponse(toDoTasksServiceImpl.queryToDoTasksPageDto(toDoTasksPageDto));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "人员任务列表全部数据查询", notes = "人员任务列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<ToDoTasksDto>> selectForList() {
return ResponseHelper.buildResponse(toDoTasksServiceImpl.queryForToDoTasksList());
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java
View file @ 99c595c3
......@@ -373,7 +373,10 @@ public class UnitInfoController extends BaseController {
String code = "";
Random random = new Random();
for (int i = 0; i < 6; i++) {
int r = random.nextInt(10)+1;
int r = random.nextInt(10);
if(r==0){
r=1;
}
code = code + r;
}
return code;
......@@ -562,7 +565,7 @@ public class UnitInfoController extends BaseController {
Collection<GroupModel> chil =new ArrayList<>();
for (GroupModel child : children) {
if("户用光伏-经销商".equals(child.getGroupName())||"用户光伏-微信农户".equals(child.getGroupName())){
//排除其余角色
}else{
chil.add(child);
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UserMessageController.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.List;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.UserMessageServiceImpl;
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.UserMessageDto;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
/**
* 人员消息
*
* @author system_generator
* @date 2023-09-12
*/
@RestController
@Api(tags = "人员消息Api")
@RequestMapping(value = "/user-message")
public class UserMessageController extends BaseController {
@Autowired
UserMessageServiceImpl userMessageServiceImpl;
/**
* 新增人员消息
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增人员消息", notes = "新增人员消息")
public ResponseModel<UserMessageDto> save(@RequestBody UserMessageDto model) {
model = userMessageServiceImpl.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<UserMessageDto> updateBySequenceNbrUserMessage(@RequestBody UserMessageDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(userMessageServiceImpl.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(userMessageServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个人员消息", notes = "根据sequenceNbr查询单个人员消息")
public ResponseModel<UserMessageDto> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(userMessageServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "人员消息分页查询", notes = "人员消息分页查询")
public ResponseModel<Page<UserMessageDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<UserMessageDto> page = new Page<UserMessageDto>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(userMessageServiceImpl.queryForUserMessagePage(page));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "人员消息列表全部数据查询", notes = "人员消息列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<UserMessageDto>> selectForList() {
return ResponseHelper.buildResponse(userMessageServiceImpl.queryForUserMessageList());
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HouseholdContractServiceImpl.java
View file @ 99c595c3
......@@ -3,11 +3,9 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.ContractTemplate;
import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
import com.yeejoin.amos.boot.module.hygf.api.entity.SealDictionary;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.ContractTemplateMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.SealDictionaryMapper;
......@@ -49,7 +47,11 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
@Autowired
ContractTemplateMapper contractTemplateMapper;
@Autowired
ToDoTasksServiceImpl toDoTasksServiceImpl;
@Autowired
PeasantHouseholdServiceImpl peasantHouseholdServiceImpl;
/**
* 列表查询 示例
*/
......@@ -186,7 +188,12 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
householdContract.setContractLockId(contractLockId);
householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());
householdContractMapper.updateById(householdContract);
return householdContract;
//创建农户待办
ToDoTasks toDoTasks1= new ToDoTasks ( TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), TaskTypeStationEnum.合同填报.getCode(),householdContract.getDealerCode());
PeasantHousehold peasantHousehold=peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getAmosUserId(),toDoTasks1);
return householdContract;
}
......@@ -287,7 +294,15 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
householdContract.setContractLockId(contractLockId);
householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());
householdContractMapper.updateById(householdContract);
return householdContract;
//生成填报任务
ToDoTasks toDoTasks1= new ToDoTasks ( TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), TaskTypeStationEnum.合同填报.getCode(),householdContract.getDealerCode());
PeasantHousehold peasan=peasantHouseholdServiceImpl.getById(householdContract.getPeasantHouseholdId());
toDoTasksServiceImpl.addToDoTasksByUserId(peasan.getAmosUserId(),toDoTasks1);
return householdContract;
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java
View file @ 99c595c3
......@@ -6,14 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.Enum.PeasantHouseholdEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.PhoneRegisterTypeEum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.Commercial;
import com.yeejoin.amos.boot.module.hygf.api.entity.ExtendedInformation;
import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
import com.yeejoin.amos.boot.module.hygf.api.entity.Information;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
import com.yeejoin.amos.boot.module.hygf.api.entity.SurveyDetails;
import com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IPeasantHouseholdService;
......@@ -148,6 +143,9 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
UnitInfoServiceImpl unitInfoServiceImpl;
@Autowired
AmosRequestContext requestContext;
@Autowired
ToDoTasksServiceImpl toDoTasksServiceImpl;
public static final String SECRETKEY = "qaz";
@Transactional (rollbackFor = Exception.class)
......@@ -195,6 +193,13 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
householdContract.setProjectUserId(peasantHousehold.getAmosUserId());
householdContractServiceImpl.addHouseholdContract(householdContract);
//生成待办任务
ToDoTasks toDoTasks= new ToDoTasks ( TaskTypeStationEnum.电站勘察.getCode(), peasantHousehold.getSequenceNbr(), TaskTypeStationEnum.电站勘察.getCode(),householdContract.getDealerCode());
toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getDeveloperUserId(),toDoTasks);
ToDoTasks toDoTasks1= new ToDoTasks ( TaskTypeStationEnum.合同填报.getCode(), householdContract.getSequenceNbr(), TaskTypeStationEnum.合同填报.getCode(),householdContract.getDealerCode());
toDoTasksServiceImpl.addToDoTasksByUserId(peasantHousehold.getDeveloperUserId(),toDoTasks1);
return model;
}
......@@ -319,13 +324,14 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
peasantHousehold.setReview(0);
peasantHousehold.setTelephone(phoneNo);
PeasantHouseholdDto peasantHouseholdDto = buildDefaultPeasantHouseholdDto(wxDTO.getAmosUserId(), wxDTO.getQrCodeType(), phoneNo);
peasantHousehold.setDeveloperCode(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getDeveloperCode).orElse(""));// 开发方code
peasantHousehold.setDeveloperCode(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getDeveloperCode).orElse(null));// 开发方code
peasantHousehold.setDeveloperId(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getDeveloperId).orElse(null));// 开发方id
peasantHousehold.setDeveloperName(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getDeveloperName).orElse(""));// 开发方名称
peasantHousehold.setDeveloper(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getDeveloper).orElse(""));// 开发人
peasantHousehold.setDeveloperName(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getDeveloperName).orElse(null));// 开发方名称
peasantHousehold.setDeveloper(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getDeveloper).orElse(null));// 开发人
peasantHousehold.setDeveloperUserId(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getDeveloperUserId).orElse(null));
peasantHousehold.setRegionalCompaniesSeq(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getRegionalCompaniesSeq).orElse(null));
peasantHousehold.setRegionalCompaniesCode(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getRegionalCompaniesCode).orElse(""));
peasantHousehold.setRegionalCompaniesName(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getRegionalCompaniesName).orElse(""));
peasantHousehold.setRegionalCompaniesCode(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getRegionalCompaniesCode).orElse(null));
peasantHousehold.setRegionalCompaniesName(Optional.ofNullable(peasantHouseholdDto).map(PeasantHouseholdDto::getRegionalCompaniesName).orElse(null));
peasantHousehold.setIsCertified(0);
// 过滤传给前端的数据
this.save(peasantHousehold);
......@@ -510,6 +516,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
dto.setDeveloperId(sequenceNbr);// 开发方id
dto.setDeveloperName(companyName);// 开发方名称
dto.setDeveloper(userInfo.getRealName());// 开发人
dto.setDeveloperUserId(userInfo.getUserId());
// UnitInfo unitInfo;
// if (!CollectionUtils.isEmpty(unitInfos)) {
// log.warn("userId:{} 查询不到经销商信息", userInfo.getUserId());
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java
View file @ 99c595c3
......@@ -7,18 +7,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationNodeEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.WorkDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
import com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold;
import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStation;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
import com.yeejoin.amos.boot.module.hygf.api.mapper.DesignInformationMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationService;
import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
......@@ -35,12 +30,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
......@@ -75,6 +65,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
HouseholdContractServiceImpl householdContractServiceImpl;
@Autowired
PersonnelBusinessMapper personnelBusinessMapper;
@Autowired
ToDoTasksMapper toDoTasksMapper;
@Autowired
ToDoTasksServiceImpl toDoTasksServiceImpl;
public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode, String ownersName, AgencyUserModel userInfo){
String serviceAgent =null;
......@@ -128,7 +122,30 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
powerStation.setNodeRole(workDto.getNodeRole());
powerStation.setNodeRouting(workDto.getNodeRouting());
}
return this.saveOrUpdate(powerStation);
Boolean fl= this.saveOrUpdate(powerStation);
if (flag){
//获取经销商orgcode
PeasantHousehold peasantHouseholdd= peasantHouseholdService.getById(powerStation.getPeasantHouseholdId());
ToDoTasks toDoTasks= new ToDoTasks ( TaskTypeStationEnum.电站审核.getCode(), powerStation.getSequenceNbr(), TaskTypeStationEnum.电站审核.getCode(),peasantHouseholdd.getDeveloperCode());
toDoTasksServiceImpl.addToDoTasksByRole(powerStation.getNodeRole(),toDoTasks);
}else{
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getType, TaskTypeStationEnum.电站审核.getCode());
wrapper.eq(ToDoTasks::getState, "待办");
wrapper.eq(ToDoTasks::getBusinessId, powerStation.getSequenceNbr());
ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
if(doTasks!=null){
doTasks.setState("已办");
doTasks.setCompleteTime(new Date());
toDoTasksMapper.updateById(doTasks);
}
}
return fl;
}catch (Exception e){
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java
View file @ 99c595c3
......@@ -265,14 +265,13 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
//获取用户所在经销商单位
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(userInfo.getUserId());
UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto(peasantHousehold.getDeveloperUserId());
BeanUtils.copyProperties(peasantHousehold, surveyInfoAllDto.getSurveyInformation());
surveyInfoAllDto.getSurveyInformation().setDeveloperName(userUnitInformationDto.getAmosDealerName());
surveyInfoAllDto.getSurveyInformation().setDeveloperCode(userUnitInformationDto.getAmosDealerOrgCode());
surveyInfoAllDto.getSurveyInformation().setDeveloperId(userUnitInformationDto.getAmosDealerId());
surveyInfoAllDto.getSurveyInformation().setSalesmanId(userInfo.getUserId());
surveyInfoAllDto.getSurveyInformation().setSalesman(userInfo.getRealName());
surveyInfoAllDto.getSurveyInformation().setCreator(userInfo.getRealName());
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/ToDoTasksServiceImpl.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.TasksRole;
import com.yeejoin.amos.boot.module.hygf.api.dto.ToDoTasksPageDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
import com.yeejoin.amos.boot.module.hygf.api.entity.ToDoTasks;
import com.yeejoin.amos.boot.module.hygf.api.mapper.ToDoTasksMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IToDoTasksService;
import com.yeejoin.amos.boot.module.hygf.api.dto.ToDoTasksDto;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.Date;
import java.util.List;
/**
* 人员任务服务实现类
*
* @author system_generator
* @date 2023-09-08
*/
@Service
public class ToDoTasksServiceImpl extends BaseService<ToDoTasksDto,ToDoTasks,ToDoTasksMapper> implements IToDoTasksService {
@Autowired
ToDoTasksMapper toDoTasksMapper;
@Autowired
RedisUtils redisUtils;
final static Logger log = LoggerFactory.getLogger(ToDoTasksServiceImpl.class);
/**
* 分页查询
*/
public Page<ToDoTasksDto> queryForToDoTasksPage(Page<ToDoTasksDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<ToDoTasksDto> queryForToDoTasksList() {
return this.queryForList("" , false);
}
public IPage<ToDoTasks> queryToDoTasksPageDto(ToDoTasksPageDto dto) {
//列表数据组装
QueryWrapper<ToDoTasks> qw = new QueryWrapper<>();
qw.eq(StringUtils.isNotEmpty(dto.getType()), "type",dto.getType() );
qw.eq(StringUtils.isNotEmpty(dto.getState()), "state",dto.getState() );
qw.eq(StringUtils.isNotEmpty(dto.getAmosUserId()), "amos_user_id",dto.getAmosUserId() );
qw.orderBy(Boolean.TRUE, Boolean.FALSE, "creation_time");
IPage<ToDoTasks> toDoTasksPage = toDoTasksMapper.selectPage(dto, qw);
return toDoTasksPage;
}
@Override
public void addToDoTasksByUserId(String userId, ToDoTasks toDoTasks) {
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getType, toDoTasks.getType());
wrapper.eq(ToDoTasks::getState, "待办");
wrapper.eq(ToDoTasks::getBusinessId, toDoTasks.getBusinessId());
ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
if(doTasks!=null){
doTasks.setState("已办");
doTasks.setCompleteTime(new Date());
toDoTasksMapper.updateById(doTasks);
}
toDoTasks.setAmosUserId(userId);
toDoTasksMapper.insert(toDoTasks);
}
@Override
@Async
public void addToDoTasksByRole(String role, ToDoTasks toDoTasks) {
//查询该角色的所有人员，按时间倒序排序。缓存，每次按顺序取一个，内存中删除一个，知道分配完，继续查询获取，重新分配。
try {
LambdaQueryWrapper<ToDoTasks> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ToDoTasks::getType, toDoTasks.getType());
wrapper.eq(ToDoTasks::getState, "待办");
wrapper.eq(ToDoTasks::getBusinessId, toDoTasks.getBusinessId());
ToDoTasks doTasks= toDoTasksMapper.selectOne(wrapper);
if(doTasks!=null){
doTasks.setState("已办");
doTasks.setCompleteTime(new Date());
toDoTasksMapper.updateById(doTasks);
}
synchronized (this) {
if (redisUtils.hasKey("TAKS_" + role)) {
List<TasksRole> list = JSON.parseArray(redisUtils.get("TAKS_" + role).toString(), TasksRole.class);
toDoTasks.setAmosUserId(list.get(0).getAmosUserId());
list.remove(0);
if (list != null && !list.isEmpty()) {
redisUtils.set("TAKS_" + role, JSON.toJSONString(list));
} else {
redisUtils.del("TAKS_" + role);
}
} else {
List<TasksRole> listd = toDoTasksMapper.getTasksRole(role,toDoTasks.getAmosOrgCode());
if (listd != null && !listd.isEmpty()) {
toDoTasks.setAmosUserId(listd.get(0).getAmosUserId());
listd.remove(0);
if (listd != null && !listd.isEmpty()) {
redisUtils.set("TAKS_" + role, JSON.toJSONString(listd));
}
} else {
log.info("没有此角色人员！");
}
}
toDoTasksMapper.insert(toDoTasks);
}
}catch(Exception e){
log.info("生成待办任务失败！");
e.printStackTrace();
}
}
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java
View file @ 99c595c3
......@@ -506,8 +506,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
BeanUtils.copyProperties(unitInfo,unitInformation);
unitInformation.setHeadCardPhotoBack(unitInformation.getHeadCardPhotoBack());
unitInformation.setHeadCardPhotoFront(unitInformation.getHeadCardPhotoFront());
unitInformation.setRegisterPcdCode(unitInformation.getRegisterPcdCode());
unitInformation.setWorkPcdCode(unitInformation.getWorkPcdCode());
unitInformation.setRegisterPcdCode((unitInformation.getRegisterPcdCode()!=null&&!"".equals(unitInformation.getRegisterPcdCode()))?unitInformation.getRegisterPcdCode():null);
unitInformation.setWorkPcdCode((unitInformation.getWorkPcdCode()!=null&&!"".equals(unitInformation.getWorkPcdCode()))?unitInformation.getWorkPcdCode():null);
BeanUtils.copyProperties(commerceInfo,commerceDto);
commerceDto.setBusinessLicensePhoto(commerceDto.getBusinessLicensePhoto());
commerceDto.setLegalPersonCardPhotoBack(commerceDto.getLegalPersonCardPhotoBack());
......@@ -545,7 +545,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
}
}
}
unitInformation.setRegisterPcd(codenameRegi!=null?codenameRegi.toString():null);
unitInformation.setRegisterPcd(codenameRegi!=null&&!"".equals(codenameRegi.toString())?codenameRegi.toString():null);
}
//办公地址
......@@ -561,7 +561,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
}
}
}
unitInformation.setWorkPcd(codenamework!=null?codenamework.toString():null);
unitInformation.setWorkPcd(codenamework!=null&&!"".equals(codenamework.toString())?codenamework.toString():null);
}
unitInformation.setHeadCardPhotoBackUrl(unitInformation.getHeadCardPhotoBackUrl());
unitInformation.setHeadCardPhotoFrontUrl(unitInformation.getHeadCardPhotoFrontUrl());
......@@ -587,10 +587,10 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
List<CompanyModel> companyModel = (List<CompanyModel>)feignClientResult.getResult();
List<String> lisd=unitInfo.getRegionalCompaniesSeq();
if(companyModel!=null&&!companyModel.isEmpty()&&lisd!=null&&!lisd.isEmpty()){
for (String aLong : lisd) {
for (Object aLong : lisd) {
for (CompanyModel compan : companyModel) {
if(compan.getSequenceNbr().longValue()==Long.valueOf(aLong).longValue()){
RegionalCompanies re= new RegionalCompanies(Long.valueOf(aLong), compan.getCompanyName(), compan.getOrgCode(), unitInfo.getSequenceNbr());
if(compan.getSequenceNbr().longValue()==Long.valueOf(aLong.toString()).longValue()){
RegionalCompanies re= new RegionalCompanies(Long.valueOf(aLong.toString()), compan.getCompanyName(), compan.getOrgCode(), unitInfo.getSequenceNbr());
regionalComp.add(re);
continue;
}
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UserMessageServiceImpl.java 0 → 100644
View file @ 99c595c3
package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import com.yeejoin.amos.boot.module.hygf.api.entity.UserMessage;
import com.yeejoin.amos.boot.module.hygf.api.mapper.UserMessageMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IUserMessageService;
import com.yeejoin.amos.boot.module.hygf.api.dto.UserMessageDto;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
/**
* 人员消息服务实现类
*
* @author system_generator
* @date 2023-09-12
*/
@Service
public class UserMessageServiceImpl extends BaseService<UserMessageDto,UserMessage,UserMessageMapper> implements IUserMessageService {
/**
* 分页查询
*/
public Page<UserMessageDto> queryForUserMessagePage(Page<UserMessageDto> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<UserMessageDto> queryForUserMessageList() {
return this.queryForList("" , false);
}
}
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties
View file @ 99c595c3
......@@ -43,9 +43,9 @@ lettuce.timeout=10000
emqx.clean-session=true
emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
emqx.broker=tcp://172.16.3.18:2883
emqx.user-name=super
emqx.password=a123456
emqx.broker=tcp://172.16.10.220:1883
emqx.user-name=admin
emqx.password=public
emqx.max-inflight=1000
......@@ -133,6 +133,7 @@ hygfProgram.secret=3bfd098cfdac002126e728d2dbf83c0d
farmer.orgCode=86
farmer.sequenceNbr=1620981815542046722
farmer.orgNamesWithoutRole=
#农户角色
farmer.roleId=1693501363645845505
# 配置接口授权用户
platform.access.loginId=hygf_platform
......@@ -148,4 +149,8 @@ dealer.managementUnitId=1678209772383399937
dealer.roleId=1678211468450885633
#查询经销商用户组
dealer.group=1681241774938419202
\ No newline at end of file
dealer.group=1681241774938419202
#户用光伏工程角色
dealer.engineering=1679674919488614401
\ No newline at end of file
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/LargeScreenImpl.java
View file @ 99c595c3
......@@ -157,7 +157,7 @@ public class LargeScreenImpl {
@Scheduled(cron = "0/10 * * * * ?")
private void sendQYYXZBMqtt(){
List<StationCacheInfoDto> listStationCacheInfoDto = commonServiceImpl.getListStationCacheInfoDto();
Map<String, List<StationCacheInfoDto>> belongAreaList = listStationCacheInfoDto.stream().collect(Collectors.groupingBy(StationCacheInfoDto::getBelongArea));
Map<String, List<StationCacheInfoDto>> belongAreaList = listStationCacheInfoDto.stream().collect(Collectors.groupingBy(StationCacheInfoDto::getAreaCode));
for (String s : belongAreaList.keySet()) {
List<String> ids = belongAreaList.get(s).stream().map(StationCacheInfoDto::getFanGatewayId).collect(Collectors.toList());
getqy(ids,s);
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
View file @ 99c595c3
......@@ -1627,20 +1627,20 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
indicatorsDtos.forEach(e -> {
switch (e.getEquipmentIndexName()) {
case "总直流功率":
map.put("sr", keepTwoDecimalPlaces(e.getValue()));
map.put("sr", keepTwoDecimalPlaces(e.getValueDouble().toString()));
break;
case "有功功率":
map.put("sc", keepTwoDecimalPlaces(e.getValue()));
map.put("sc", keepTwoDecimalPlaces(e.getValueDouble().toString()));
break;
case "逆变器效率":
map.put("efficiency", keepTwoDecimalPlaces(e.getValue()));
map.put("efficiency", keepTwoDecimalPlaces(e.getValueDouble().toString()));
break;
case "日发电量":
double v = Double.parseDouble(e.getValue()) * CommonConstans.pvGenPoweActor;
double v = Double.parseDouble(e.getValueDouble().toString()) * CommonConstans.pvGenPoweActor;
map.put("dayNum", keepTwoDecimalPlaces(String.valueOf(v)));
break;
case "总发电量":
double a = Double.parseDouble(e.getValue()) * CommonConstans.pvGenPoweActor;
double a = Double.parseDouble(e.getValueDouble().toString()) * CommonConstans.pvGenPoweActor;
map.put("yearNum", keepTwoDecimalPlaces(String.valueOf(a)));
break;
}
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java
View file @ 99c595c3
......@@ -195,10 +195,10 @@ public class MonitoringServiceImpl {
if (stationCacheInfoDto.getStationType().equals("FDZ")) {
//用于组装-es查询条件
Map<String, List<String>> queryCondtion = new HashMap<>();
queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("30秒平均风速", "有功功率", "日发电量", "月发电量", "年发电量"));
queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("瞬时风速", "有功功率", "日发电量", "月发电量", "年发电量"));
queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationCacheInfoDto.getFanGatewayId()));
List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
completionOfPowerIndicatorsDto.setWindSpeedOrIrradiance(String.format(CommonConstans.Twodecimalplaces, commonServiceImpl.getAvagerByEquipmentIndxName(result, "30秒平均风速")));
completionOfPowerIndicatorsDto.setWindSpeedOrIrradiance(String.format(CommonConstans.Twodecimalplaces, commonServiceImpl.getAvagerByEquipmentIndxName(result, "瞬时风速")));
completionOfPowerIndicatorsDto.setActivePower(String.format(CommonConstans.Twodecimalplaces, commonServiceImpl.getSumByEquipmentIndxName(result, "有功功率")));
completionOfPowerIndicatorsDto.setDailyPower(String.format(CommonConstans.Fourdecimalplaces, commonServiceImpl.getSumByEquipmentIndxName(result, "日发电量")));
completionOfPowerIndicatorsDto.setMonthlyPower(String.format(CommonConstans.Fourdecimalplaces, commonServiceImpl.getSumByEquipmentIndxName(result, "月发电量")));
......
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