diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/DelCommunitySelfOrganizationFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/DelCommunitySelfOrganizationFormDTO.java new file mode 100644 index 0000000000..67ee078676 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/DelCommunitySelfOrganizationFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/11/19 4:19 下午 + * @DESC + */ +@Data +public class DelCommunitySelfOrganizationFormDTO implements Serializable { + + private static final long serialVersionUID = 789228513283561471L; + + public interface DelCommunitySelfOrganizationForm{} + + @NotBlank(message = "orgId不能为空",groups = DelCommunitySelfOrganizationForm.class) + private String orgId; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java index db5347343f..f5291bb1e5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java @@ -31,9 +31,7 @@ import com.epmet.dto.IcCommunitySelfOrganizationDTO; import com.epmet.dto.form.AddCommunitySelfOrganizationFormDTO; import com.epmet.dto.form.CommunitySelfOrganizationListFormDTO; import com.epmet.dto.form.EditCommunitySelfOrganizationFormDTO; -import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.result.CommunitySelfOrganizationListResultDTO; -import com.epmet.dto.result.demand.OptionDTO; import com.epmet.excel.IcCommunitySelfOrganizationExcel; import com.epmet.service.IcCommunitySelfOrganizationService; import org.springframework.beans.factory.annotation.Autowired; @@ -140,6 +138,19 @@ public class IcCommunitySelfOrganizationController { return new Result().ok(icCommunitySelfOrganizationService.communitySelfOrganizationList(tokenDto, formDTO)); } + /** + * @Description 社区自组织删除 + * @param formDTO + * @author zxc + * @date 2021/11/19 4:22 下午 + */ + @PostMapping("delcommunityselforganization") + public Result delCommunitySelfOrganization(@RequestBody DelCommunitySelfOrganizationFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, DelCommunitySelfOrganizationFormDTO.DelCommunitySelfOrganizationForm.class); + icCommunitySelfOrganizationService.delCommunitySelfOrganization(formDTO); + return new Result(); + } + /** * 需求指派，选择社区自组织，调用此接口 * 返回需求所属社区下的 组织 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java index b389335642..2d3a15da49 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcCommunitySelfOrganizationService.java @@ -24,9 +24,7 @@ import com.epmet.dto.IcCommunitySelfOrganizationDTO; import com.epmet.dto.form.AddCommunitySelfOrganizationFormDTO; import com.epmet.dto.form.CommunitySelfOrganizationListFormDTO; import com.epmet.dto.form.EditCommunitySelfOrganizationFormDTO; -import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.result.CommunitySelfOrganizationListResultDTO; -import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcCommunitySelfOrganizationEntity; import java.util.List; @@ -127,6 +125,15 @@ public interface IcCommunitySelfOrganizationService extends BaseService - + DELETE FROM ic_community_self_organization_personnel WHERE ORG_ID = #{orgId} - + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlaceOrgDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceOrgDTO.java similarity index 97% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlaceOrgDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceOrgDTO.java index bc61f843e8..f836ce406f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlaceOrgDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlaceOrgDTO.java @@ -29,7 +29,7 @@ import lombok.Data; * @since v1.0.0 2021-11-18 */ @Data -public class PlaceOrgDTO implements Serializable { +public class IcPlaceOrgDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolRecordDTO.java similarity index 97% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolRecordDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolRecordDTO.java index 592ff13956..62f6f491e2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolRecordDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolRecordDTO.java @@ -29,7 +29,7 @@ import lombok.Data; * @since v1.0.0 2021-11-18 */ @Data -public class PlacePatrolRecordDTO implements Serializable { +public class IcPlacePatrolRecordDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolReviewRecordDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolReviewRecordDTO.java similarity index 96% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolReviewRecordDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolReviewRecordDTO.java index dbc2160e45..d93e3928c7 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolReviewRecordDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolReviewRecordDTO.java @@ -29,7 +29,7 @@ import lombok.Data; * @since v1.0.0 2021-11-18 */ @Data -public class PlacePatrolReviewRecordDTO implements Serializable { +public class IcPlacePatrolReviewRecordDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolTeamDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamDTO.java similarity index 97% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolTeamDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamDTO.java index b80cd8509b..6a3816fc29 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolTeamDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamDTO.java @@ -29,7 +29,7 @@ import lombok.Data; * @since v1.0.0 2021-11-18 */ @Data -public class PlacePatrolTeamDTO implements Serializable { +public class IcPlacePatrolTeamDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolTeamStaffDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamStaffDTO.java similarity index 96% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolTeamStaffDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamStaffDTO.java index 48f69a5c4a..36eb03ac3a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/PlacePatrolTeamStaffDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPlacePatrolTeamStaffDTO.java @@ -29,7 +29,7 @@ import lombok.Data; * @since v1.0.0 2021-11-18 */ @Data -public class PlacePatrolTeamStaffDTO implements Serializable { +public class IcPlacePatrolTeamStaffDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlacePatrolTeamDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlacePatrolTeamDetailResultDTO.java index acbbbbda57..6869a2fb75 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlacePatrolTeamDetailResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PlacePatrolTeamDetailResultDTO.java @@ -1,6 +1,6 @@ package com.epmet.dto.result; -import com.epmet.dto.PlacePatrolTeamStaffDTO; +import com.epmet.dto.IcPlacePatrolTeamStaffDTO; import lombok.Data; import java.io.Serializable; @@ -33,6 +33,6 @@ public class PlacePatrolTeamDetailResultDTO implements Serializable { //创建时间 private String time; //分队成员信息 - private List memberList; + private List memberList; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlaceOrgController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java similarity index 96% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlaceOrgController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java index dce1acdc07..413c721b89 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlaceOrgController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlaceOrgController.java @@ -26,7 +26,7 @@ import com.epmet.dto.form.EditPlaceOrgFormDTO; import com.epmet.dto.form.GetListPlaceOrgFormDTO; import com.epmet.dto.result.GetListPlaceOrgResultDTO; import com.epmet.dto.result.PlaceOrgDetailResultDTO; -import com.epmet.service.PlaceOrgService; +import com.epmet.service.IcPlaceOrgService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,10 +42,10 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("placeorg") -public class PlaceOrgController { +public class IcPlaceOrgController { @Autowired - private PlaceOrgService placeOrgService; + private IcPlaceOrgService placeOrgService; /** * @Author sun diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlacePatrolRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java similarity index 69% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlacePatrolRecordController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java index 35cbfad262..5c80607590 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlacePatrolRecordController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolRecordController.java @@ -25,9 +25,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.PlacePatrolRecordDTO; -import com.epmet.excel.PlacePatrolRecordExcel; -import com.epmet.service.PlacePatrolRecordService; +import com.epmet.dto.IcPlacePatrolRecordDTO; +import com.epmet.excel.IcPlacePatrolRecordExcel; +import com.epmet.service.IcPlacePatrolRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -44,25 +44,25 @@ import java.util.Map; */ @RestController @RequestMapping("placepatrolrecord") -public class PlacePatrolRecordController { +public class IcPlacePatrolRecordController { @Autowired - private PlacePatrolRecordService placePatrolRecordService; + private IcPlacePatrolRecordService placePatrolRecordService; @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = placePatrolRecordService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = placePatrolRecordService.page(params); + return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - PlacePatrolRecordDTO data = placePatrolRecordService.get(id); - return new Result().ok(data); + public Result get(@PathVariable("id") String id){ + IcPlacePatrolRecordDTO data = placePatrolRecordService.get(id); + return new Result().ok(data); } @PostMapping - public Result save(@RequestBody PlacePatrolRecordDTO dto){ + public Result save(@RequestBody IcPlacePatrolRecordDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); placePatrolRecordService.save(dto); @@ -70,7 +70,7 @@ public class PlacePatrolRecordController { } @PutMapping - public Result update(@RequestBody PlacePatrolRecordDTO dto){ + public Result update(@RequestBody IcPlacePatrolRecordDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); placePatrolRecordService.update(dto); @@ -87,8 +87,8 @@ public class PlacePatrolRecordController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = placePatrolRecordService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, PlacePatrolRecordExcel.class); + List list = placePatrolRecordService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IcPlacePatrolRecordExcel.class); } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlacePatrolReviewRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolReviewRecordController.java similarity index 68% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlacePatrolReviewRecordController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolReviewRecordController.java index a6caf1d1aa..7e174799d3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlacePatrolReviewRecordController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolReviewRecordController.java @@ -25,9 +25,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.PlacePatrolReviewRecordDTO; -import com.epmet.excel.PlacePatrolReviewRecordExcel; -import com.epmet.service.PlacePatrolReviewRecordService; +import com.epmet.dto.IcPlacePatrolReviewRecordDTO; +import com.epmet.excel.IcPlacePatrolReviewRecordExcel; +import com.epmet.service.IcPlacePatrolReviewRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -44,25 +44,25 @@ import java.util.Map; */ @RestController @RequestMapping("placepatrolreviewrecord") -public class PlacePatrolReviewRecordController { +public class IcPlacePatrolReviewRecordController { @Autowired - private PlacePatrolReviewRecordService placePatrolReviewRecordService; + private IcPlacePatrolReviewRecordService placePatrolReviewRecordService; @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = placePatrolReviewRecordService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = placePatrolReviewRecordService.page(params); + return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - PlacePatrolReviewRecordDTO data = placePatrolReviewRecordService.get(id); - return new Result().ok(data); + public Result get(@PathVariable("id") String id){ + IcPlacePatrolReviewRecordDTO data = placePatrolReviewRecordService.get(id); + return new Result().ok(data); } @PostMapping - public Result save(@RequestBody PlacePatrolReviewRecordDTO dto){ + public Result save(@RequestBody IcPlacePatrolReviewRecordDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); placePatrolReviewRecordService.save(dto); @@ -70,7 +70,7 @@ public class PlacePatrolReviewRecordController { } @PutMapping - public Result update(@RequestBody PlacePatrolReviewRecordDTO dto){ + public Result update(@RequestBody IcPlacePatrolReviewRecordDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); placePatrolReviewRecordService.update(dto); @@ -87,8 +87,8 @@ public class PlacePatrolReviewRecordController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = placePatrolReviewRecordService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, PlacePatrolReviewRecordExcel.class); + List list = placePatrolReviewRecordService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IcPlacePatrolReviewRecordExcel.class); } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlacePatrolTeamController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamController.java similarity index 96% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlacePatrolTeamController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamController.java index 5333ab234f..c87c8d771c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlacePatrolTeamController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamController.java @@ -26,7 +26,7 @@ import com.epmet.dto.form.EditPlacePatrolTeamFormDTO; import com.epmet.dto.form.GetListPlacePatrolTeamFormDTO; import com.epmet.dto.result.GetListPlacePatrolTeamResultDTO; import com.epmet.dto.result.PlacePatrolTeamDetailResultDTO; -import com.epmet.service.PlacePatrolTeamService; +import com.epmet.service.IcPlacePatrolTeamService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -42,10 +42,10 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("placepatrolteam") -public class PlacePatrolTeamController { +public class IcPlacePatrolTeamController { @Autowired - private PlacePatrolTeamService placePatrolTeamService; + private IcPlacePatrolTeamService placePatrolTeamService; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlacePatrolTeamStaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamStaffController.java similarity index 69% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlacePatrolTeamStaffController.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamStaffController.java index 787d98981e..0ed87c6e42 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PlacePatrolTeamStaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcPlacePatrolTeamStaffController.java @@ -25,9 +25,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.PlacePatrolTeamStaffDTO; -import com.epmet.excel.PlacePatrolTeamStaffExcel; -import com.epmet.service.PlacePatrolTeamStaffService; +import com.epmet.dto.IcPlacePatrolTeamStaffDTO; +import com.epmet.excel.IcPlacePatrolTeamStaffExcel; +import com.epmet.service.IcPlacePatrolTeamStaffService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -44,25 +44,25 @@ import java.util.Map; */ @RestController @RequestMapping("placepatrolteamstaff") -public class PlacePatrolTeamStaffController { +public class IcPlacePatrolTeamStaffController { @Autowired - private PlacePatrolTeamStaffService placePatrolTeamStaffService; + private IcPlacePatrolTeamStaffService placePatrolTeamStaffService; @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = placePatrolTeamStaffService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = placePatrolTeamStaffService.page(params); + return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - PlacePatrolTeamStaffDTO data = placePatrolTeamStaffService.get(id); - return new Result().ok(data); + public Result get(@PathVariable("id") String id){ + IcPlacePatrolTeamStaffDTO data = placePatrolTeamStaffService.get(id); + return new Result().ok(data); } @PostMapping - public Result save(@RequestBody PlacePatrolTeamStaffDTO dto){ + public Result save(@RequestBody IcPlacePatrolTeamStaffDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); placePatrolTeamStaffService.save(dto); @@ -70,7 +70,7 @@ public class PlacePatrolTeamStaffController { } @PutMapping - public Result update(@RequestBody PlacePatrolTeamStaffDTO dto){ + public Result update(@RequestBody IcPlacePatrolTeamStaffDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); placePatrolTeamStaffService.update(dto); @@ -87,8 +87,8 @@ public class PlacePatrolTeamStaffController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = placePatrolTeamStaffService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, PlacePatrolTeamStaffExcel.class); + List list = placePatrolTeamStaffService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, IcPlacePatrolTeamStaffExcel.class); } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlaceOrgDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java similarity index 88% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlaceOrgDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java index 0f396158c1..a3c5c667bd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlaceOrgDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlaceOrgDao.java @@ -19,9 +19,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.GetListPlaceOrgFormDTO; -import com.epmet.dto.result.GetListPlaceOrgResultDTO; import com.epmet.dto.result.PlaceOrgDetailResultDTO; -import com.epmet.entity.PlaceOrgEntity; +import com.epmet.entity.IcPlaceOrgEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -33,7 +32,7 @@ import java.util.List; * @since v1.0.0 2021-11-18 */ @Mapper -public interface PlaceOrgDao extends BaseDao { +public interface IcPlaceOrgDao extends BaseDao { /** * @Author sun diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolRecordDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolRecordDao.java similarity index 87% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolRecordDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolRecordDao.java index 8d501f16e9..9d2f51de8c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolRecordDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolRecordDao.java @@ -18,7 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.PlacePatrolRecordEntity; +import com.epmet.entity.IcPlacePatrolRecordEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2021-11-18 */ @Mapper -public interface PlacePatrolRecordDao extends BaseDao { +public interface IcPlacePatrolRecordDao extends BaseDao { } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolReviewRecordDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolReviewRecordDao.java similarity index 86% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolReviewRecordDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolReviewRecordDao.java index 6253e7afd2..8c7fb0703e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolReviewRecordDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolReviewRecordDao.java @@ -18,7 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.PlacePatrolReviewRecordEntity; +import com.epmet.entity.IcPlacePatrolReviewRecordEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2021-11-18 */ @Mapper -public interface PlacePatrolReviewRecordDao extends BaseDao { +public interface IcPlacePatrolReviewRecordDao extends BaseDao { } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolTeamDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolTeamDao.java similarity index 90% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolTeamDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolTeamDao.java index 6af5ca74fb..d53d0f24e8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolTeamDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolTeamDao.java @@ -20,7 +20,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.GetListPlacePatrolTeamFormDTO; import com.epmet.dto.result.PlacePatrolTeamDetailResultDTO; -import com.epmet.entity.PlacePatrolTeamEntity; +import com.epmet.entity.IcPlacePatrolTeamEntity; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -32,7 +32,7 @@ import java.util.List; * @since v1.0.0 2021-11-18 */ @Mapper -public interface PlacePatrolTeamDao extends BaseDao { +public interface IcPlacePatrolTeamDao extends BaseDao { /** * @Author sun diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolTeamStaffDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolTeamStaffDao.java similarity index 81% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolTeamStaffDao.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolTeamStaffDao.java index 2009cff9ca..c5af8a717f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/PlacePatrolTeamStaffDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPlacePatrolTeamStaffDao.java @@ -18,8 +18,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.PlacePatrolTeamStaffDTO; -import com.epmet.entity.PlacePatrolTeamStaffEntity; +import com.epmet.dto.IcPlacePatrolTeamStaffDTO; +import com.epmet.entity.IcPlacePatrolTeamStaffEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,7 +32,7 @@ import java.util.List; * @since v1.0.0 2021-11-18 */ @Mapper -public interface PlacePatrolTeamStaffDao extends BaseDao { +public interface IcPlacePatrolTeamStaffDao extends BaseDao { /** * @Author sun @@ -44,5 +44,5 @@ public interface PlacePatrolTeamStaffDao extends BaseDao getByTeamId(@Param("teamId") String teamId); + List getByTeamId(@Param("teamId") String teamId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlaceOrgEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceOrgEntity.java similarity index 97% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlaceOrgEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceOrgEntity.java index fbe92edea5..4908c96964 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlaceOrgEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlaceOrgEntity.java @@ -34,7 +34,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("place_org") -public class PlaceOrgEntity extends BaseEpmetEntity { +public class IcPlaceOrgEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolRecordEntity.java similarity index 97% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolRecordEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolRecordEntity.java index b5a2c64dd2..2431776acb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolRecordEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolRecordEntity.java @@ -34,7 +34,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("place_patrol_record") -public class PlacePatrolRecordEntity extends BaseEpmetEntity { +public class IcPlacePatrolRecordEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolReviewRecordEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolReviewRecordEntity.java similarity index 96% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolReviewRecordEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolReviewRecordEntity.java index 196794d147..3da195adb9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolReviewRecordEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolReviewRecordEntity.java @@ -34,7 +34,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("place_patrol_review_record") -public class PlacePatrolReviewRecordEntity extends BaseEpmetEntity { +public class IcPlacePatrolReviewRecordEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolTeamEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamEntity.java similarity index 96% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolTeamEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamEntity.java index dce4701f43..ea5adbde0d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolTeamEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamEntity.java @@ -34,7 +34,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("place_patrol_team") -public class PlacePatrolTeamEntity extends BaseEpmetEntity { +public class IcPlacePatrolTeamEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolTeamStaffEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamStaffEntity.java similarity index 95% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolTeamStaffEntity.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamStaffEntity.java index f0012def21..0a469ee82c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/PlacePatrolTeamStaffEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPlacePatrolTeamStaffEntity.java @@ -34,7 +34,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("place_patrol_team_staff") -public class PlacePatrolTeamStaffEntity extends BaseEpmetEntity { +public class IcPlacePatrolTeamStaffEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlaceOrgExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlaceOrgExcel.java similarity index 98% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlaceOrgExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlaceOrgExcel.java index 83a6fb8792..4647a3e9b9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlaceOrgExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlaceOrgExcel.java @@ -29,7 +29,7 @@ import java.util.Date; * @since v1.0.0 2021-11-18 */ @Data -public class PlaceOrgExcel { +public class IcPlaceOrgExcel { @Excel(name = "唯一标识") private String id; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolRecordExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolRecordExcel.java similarity index 98% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolRecordExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolRecordExcel.java index ccf1208aaa..7404ed6a42 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolRecordExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolRecordExcel.java @@ -29,7 +29,7 @@ import java.util.Date; * @since v1.0.0 2021-11-18 */ @Data -public class PlacePatrolRecordExcel { +public class IcPlacePatrolRecordExcel { @Excel(name = "唯一标识") private String id; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolReviewRecordExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolReviewRecordExcel.java similarity index 97% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolReviewRecordExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolReviewRecordExcel.java index c98b265c27..3a997045a3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolReviewRecordExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolReviewRecordExcel.java @@ -29,7 +29,7 @@ import java.util.Date; * @since v1.0.0 2021-11-18 */ @Data -public class PlacePatrolReviewRecordExcel { +public class IcPlacePatrolReviewRecordExcel { @Excel(name = "唯一标识") private String id; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolTeamExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolTeamExcel.java similarity index 98% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolTeamExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolTeamExcel.java index b77fce4de4..b690216b1e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolTeamExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolTeamExcel.java @@ -29,7 +29,7 @@ import java.util.Date; * @since v1.0.0 2021-11-18 */ @Data -public class PlacePatrolTeamExcel { +public class IcPlacePatrolTeamExcel { @Excel(name = "唯一标识") private String id; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolTeamStaffExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolTeamStaffExcel.java similarity index 97% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolTeamStaffExcel.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolTeamStaffExcel.java index db8c9c250a..99e1641231 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/PlacePatrolTeamStaffExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPlacePatrolTeamStaffExcel.java @@ -29,7 +29,7 @@ import java.util.Date; * @since v1.0.0 2021-11-18 */ @Data -public class PlacePatrolTeamStaffExcel { +public class IcPlacePatrolTeamStaffExcel { @Excel(name = "唯一标识") private String id; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlaceOrgService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java similarity index 93% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlaceOrgService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java index 733ef7db48..e8fed58f7a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlaceOrgService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlaceOrgService.java @@ -23,7 +23,7 @@ import com.epmet.dto.form.EditPlaceOrgFormDTO; import com.epmet.dto.form.GetListPlaceOrgFormDTO; import com.epmet.dto.result.GetListPlaceOrgResultDTO; import com.epmet.dto.result.PlaceOrgDetailResultDTO; -import com.epmet.entity.PlaceOrgEntity; +import com.epmet.entity.IcPlaceOrgEntity; /** * 九小场所下组织管理 @@ -31,7 +31,7 @@ import com.epmet.entity.PlaceOrgEntity; * @author generator generator@elink-cn.com * @since v1.0.0 2021-11-18 */ -public interface PlaceOrgService extends BaseService { +public interface IcPlaceOrgService extends BaseService { /** * @Author sun diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlacePatrolRecordService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java similarity index 80% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlacePatrolRecordService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java index 51d4885918..3c0ed4b02c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlacePatrolRecordService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolRecordService.java @@ -19,8 +19,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.PlacePatrolRecordDTO; -import com.epmet.entity.PlacePatrolRecordEntity; +import com.epmet.dto.IcPlacePatrolRecordDTO; +import com.epmet.entity.IcPlacePatrolRecordEntity; import java.util.List; import java.util.Map; @@ -31,7 +31,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-11-18 */ -public interface PlacePatrolRecordService extends BaseService { +public interface IcPlacePatrolRecordService extends BaseService { /** * 默认分页 @@ -41,7 +41,7 @@ public interface PlacePatrolRecordService extends BaseService page(Map params); + PageData page(Map params); /** * 默认查询 @@ -51,7 +51,7 @@ public interface PlacePatrolRecordService extends BaseService list(Map params); + List list(Map params); /** * 单条查询 @@ -61,7 +61,7 @@ public interface PlacePatrolRecordService extends BaseService { +public interface IcPlacePatrolReviewRecordService extends BaseService { /** * 默认分页 @@ -41,7 +41,7 @@ public interface PlacePatrolReviewRecordService extends BaseService page(Map params); + PageData page(Map params); /** * 默认查询 @@ -51,7 +51,7 @@ public interface PlacePatrolReviewRecordService extends BaseService list(Map params); + List list(Map params); /** * 单条查询 @@ -61,7 +61,7 @@ public interface PlacePatrolReviewRecordService extends BaseService { +public interface IcPlacePatrolTeamService extends BaseService { /** * @Author sun diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlacePatrolTeamStaffService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamStaffService.java similarity index 80% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlacePatrolTeamStaffService.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamStaffService.java index e124aadd1b..ec3fea917a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PlacePatrolTeamStaffService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPlacePatrolTeamStaffService.java @@ -19,8 +19,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.PlacePatrolTeamStaffDTO; -import com.epmet.entity.PlacePatrolTeamStaffEntity; +import com.epmet.dto.IcPlacePatrolTeamStaffDTO; +import com.epmet.entity.IcPlacePatrolTeamStaffEntity; import java.util.List; import java.util.Map; @@ -31,7 +31,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-11-18 */ -public interface PlacePatrolTeamStaffService extends BaseService { +public interface IcPlacePatrolTeamStaffService extends BaseService { /** * 默认分页 @@ -41,7 +41,7 @@ public interface PlacePatrolTeamStaffService extends BaseService page(Map params); + PageData page(Map params); /** * 默认查询 @@ -51,7 +51,7 @@ public interface PlacePatrolTeamStaffService extends BaseService list(Map params); + List list(Map params); /** * 单条查询 @@ -61,7 +61,7 @@ public interface PlacePatrolTeamStaffService extends BaseService implements PlaceOrgService { - private static final Logger log = LoggerFactory.getLogger(PlaceOrgServiceImpl.class); +public class IcPlaceOrgServiceImpl extends BaseServiceImpl implements IcPlaceOrgService { + private static final Logger log = LoggerFactory.getLogger(IcPlaceOrgServiceImpl.class); @Autowired private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient; @@ -68,7 +64,7 @@ public class PlaceOrgServiceImpl extends BaseServiceImpl%s", formDTO.getPlaceOrgId())); } - entity = ConvertUtils.sourceToTarget(formDTO, PlaceOrgEntity.class); + entity = ConvertUtils.sourceToTarget(formDTO, IcPlaceOrgEntity.class); baseDao.updateById(entity); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java similarity index 59% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolRecordServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java index 6953888aac..1f1eae6568 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolRecordServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolRecordServiceImpl.java @@ -23,10 +23,10 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.PlacePatrolRecordDao; -import com.epmet.dto.PlacePatrolRecordDTO; -import com.epmet.entity.PlacePatrolRecordEntity; -import com.epmet.service.PlacePatrolRecordService; +import com.epmet.dao.IcPlacePatrolRecordDao; +import com.epmet.dto.IcPlacePatrolRecordDTO; +import com.epmet.entity.IcPlacePatrolRecordEntity; +import com.epmet.service.IcPlacePatrolRecordService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,51 +42,51 @@ import java.util.Map; * @since v1.0.0 2021-11-18 */ @Service -public class PlacePatrolRecordServiceImpl extends BaseServiceImpl implements PlacePatrolRecordService { +public class IcPlacePatrolRecordServiceImpl extends BaseServiceImpl implements IcPlacePatrolRecordService { @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, PlacePatrolRecordDTO.class); + return getPageData(page, IcPlacePatrolRecordDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, PlacePatrolRecordDTO.class); + return ConvertUtils.sourceToTarget(entityList, IcPlacePatrolRecordDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public PlacePatrolRecordDTO get(String id) { - PlacePatrolRecordEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, PlacePatrolRecordDTO.class); + public IcPlacePatrolRecordDTO get(String id) { + IcPlacePatrolRecordEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcPlacePatrolRecordDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(PlacePatrolRecordDTO dto) { - PlacePatrolRecordEntity entity = ConvertUtils.sourceToTarget(dto, PlacePatrolRecordEntity.class); + public void save(IcPlacePatrolRecordDTO dto) { + IcPlacePatrolRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcPlacePatrolRecordEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(PlacePatrolRecordDTO dto) { - PlacePatrolRecordEntity entity = ConvertUtils.sourceToTarget(dto, PlacePatrolRecordEntity.class); + public void update(IcPlacePatrolRecordDTO dto) { + IcPlacePatrolRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcPlacePatrolRecordEntity.class); updateById(entity); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolReviewRecordServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java similarity index 56% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolReviewRecordServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java index 532bbc2545..8f42a76201 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolReviewRecordServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolReviewRecordServiceImpl.java @@ -23,10 +23,10 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.PlacePatrolReviewRecordDao; -import com.epmet.dto.PlacePatrolReviewRecordDTO; -import com.epmet.entity.PlacePatrolReviewRecordEntity; -import com.epmet.service.PlacePatrolReviewRecordService; +import com.epmet.dao.IcPlacePatrolReviewRecordDao; +import com.epmet.dto.IcPlacePatrolReviewRecordDTO; +import com.epmet.entity.IcPlacePatrolReviewRecordEntity; +import com.epmet.service.IcPlacePatrolReviewRecordService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,51 +42,51 @@ import java.util.Map; * @since v1.0.0 2021-11-18 */ @Service -public class PlacePatrolReviewRecordServiceImpl extends BaseServiceImpl implements PlacePatrolReviewRecordService { +public class IcPlacePatrolReviewRecordServiceImpl extends BaseServiceImpl implements IcPlacePatrolReviewRecordService { @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, PlacePatrolReviewRecordDTO.class); + return getPageData(page, IcPlacePatrolReviewRecordDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, PlacePatrolReviewRecordDTO.class); + return ConvertUtils.sourceToTarget(entityList, IcPlacePatrolReviewRecordDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public PlacePatrolReviewRecordDTO get(String id) { - PlacePatrolReviewRecordEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, PlacePatrolReviewRecordDTO.class); + public IcPlacePatrolReviewRecordDTO get(String id) { + IcPlacePatrolReviewRecordEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcPlacePatrolReviewRecordDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(PlacePatrolReviewRecordDTO dto) { - PlacePatrolReviewRecordEntity entity = ConvertUtils.sourceToTarget(dto, PlacePatrolReviewRecordEntity.class); + public void save(IcPlacePatrolReviewRecordDTO dto) { + IcPlacePatrolReviewRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcPlacePatrolReviewRecordEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(PlacePatrolReviewRecordDTO dto) { - PlacePatrolReviewRecordEntity entity = ConvertUtils.sourceToTarget(dto, PlacePatrolReviewRecordEntity.class); + public void update(IcPlacePatrolReviewRecordDTO dto) { + IcPlacePatrolReviewRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcPlacePatrolReviewRecordEntity.class); updateById(entity); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolTeamServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java similarity index 87% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolTeamServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java index 1b331bdefb..465468314c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolTeamServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamServiceImpl.java @@ -26,26 +26,20 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.CustomerGridDao; -import com.epmet.dao.PlacePatrolTeamDao; +import com.epmet.dao.IcPlacePatrolTeamDao; import com.epmet.dto.CustomerGridDTO; -import com.epmet.dto.PlacePatrolTeamStaffDTO; import com.epmet.dto.form.AddPlacePatrolTeamFormDTO; import com.epmet.dto.form.EditPlacePatrolTeamFormDTO; -import com.epmet.dto.form.GetListPlaceOrgFormDTO; import com.epmet.dto.form.GetListPlacePatrolTeamFormDTO; -import com.epmet.dto.result.GetListPlaceOrgResultDTO; import com.epmet.dto.result.GetListPlacePatrolTeamResultDTO; -import com.epmet.dto.result.PlaceOrgDetailResultDTO; import com.epmet.dto.result.PlacePatrolTeamDetailResultDTO; -import com.epmet.entity.PlaceOrgEntity; -import com.epmet.entity.PlacePatrolTeamEntity; -import com.epmet.entity.PlacePatrolTeamStaffEntity; +import com.epmet.entity.IcPlacePatrolTeamEntity; +import com.epmet.entity.IcPlacePatrolTeamStaffEntity; import com.epmet.feign.EpmetAdminOpenFeignClient; -import com.epmet.service.PlacePatrolTeamService; -import com.epmet.service.PlacePatrolTeamStaffService; +import com.epmet.service.IcPlacePatrolTeamService; +import com.epmet.service.IcPlacePatrolTeamStaffService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import org.apache.ibatis.annotations.Param; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -64,12 +58,12 @@ import java.util.stream.Collectors; * @since v1.0.0 2021-11-18 */ @Service -public class PlacePatrolTeamServiceImpl extends BaseServiceImpl implements PlacePatrolTeamService { - private static final Logger log = LoggerFactory.getLogger(PlacePatrolTeamServiceImpl.class); +public class IcPlacePatrolTeamServiceImpl extends BaseServiceImpl implements IcPlacePatrolTeamService { + private static final Logger log = LoggerFactory.getLogger(IcPlacePatrolTeamServiceImpl.class); @Autowired private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient; @Autowired - private PlacePatrolTeamStaffService placePatrolTeamStaffService; + private IcPlacePatrolTeamStaffService placePatrolTeamStaffService; @Autowired private CustomerGridDao customerGridDao; @@ -81,15 +75,15 @@ public class PlacePatrolTeamServiceImpl extends BaseServiceImpl entityList = new ArrayList<>(); + List entityList = new ArrayList<>(); formDTO.getMemberList().forEach(m -> { - PlacePatrolTeamStaffEntity entity1 = new PlacePatrolTeamStaffEntity(); + IcPlacePatrolTeamStaffEntity entity1 = new IcPlacePatrolTeamStaffEntity(); entity1.setCustomerId(formDTO.getCustomerId()); entity1.setPlacePatrolTeamId(entity.getId()); entity1.setName(m.getName()); @@ -108,16 +102,16 @@ public class PlacePatrolTeamServiceImpl extends BaseServiceImpl%s", formDTO.getTeamId())); } - entity = ConvertUtils.sourceToTarget(formDTO, PlacePatrolTeamEntity.class); + entity = ConvertUtils.sourceToTarget(formDTO, IcPlacePatrolTeamEntity.class); baseDao.updateById(entity); //2.全删全增分队成员字表数据 - List entityList = new ArrayList<>(); + List entityList = new ArrayList<>(); for (EditPlacePatrolTeamFormDTO.Member m : formDTO.getMemberList()) { - PlacePatrolTeamStaffEntity entity1 = new PlacePatrolTeamStaffEntity(); + IcPlacePatrolTeamStaffEntity entity1 = new IcPlacePatrolTeamStaffEntity(); entity1.setCustomerId(entity.getCustomerId()); entity1.setPlacePatrolTeamId(entity.getId()); entity1.setName(m.getName()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolTeamStaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamStaffServiceImpl.java similarity index 60% rename from epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolTeamStaffServiceImpl.java rename to epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamStaffServiceImpl.java index e707539673..21e1733726 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PlacePatrolTeamStaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPlacePatrolTeamStaffServiceImpl.java @@ -23,10 +23,10 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.PlacePatrolTeamStaffDao; -import com.epmet.dto.PlacePatrolTeamStaffDTO; -import com.epmet.entity.PlacePatrolTeamStaffEntity; -import com.epmet.service.PlacePatrolTeamStaffService; +import com.epmet.dao.IcPlacePatrolTeamStaffDao; +import com.epmet.dto.IcPlacePatrolTeamStaffDTO; +import com.epmet.entity.IcPlacePatrolTeamStaffEntity; +import com.epmet.service.IcPlacePatrolTeamStaffService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,51 +42,51 @@ import java.util.Map; * @since v1.0.0 2021-11-18 */ @Service -public class PlacePatrolTeamStaffServiceImpl extends BaseServiceImpl implements PlacePatrolTeamStaffService { +public class IcPlacePatrolTeamStaffServiceImpl extends BaseServiceImpl implements IcPlacePatrolTeamStaffService { @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, PlacePatrolTeamStaffDTO.class); + return getPageData(page, IcPlacePatrolTeamStaffDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, PlacePatrolTeamStaffDTO.class); + return ConvertUtils.sourceToTarget(entityList, IcPlacePatrolTeamStaffDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public PlacePatrolTeamStaffDTO get(String id) { - PlacePatrolTeamStaffEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, PlacePatrolTeamStaffDTO.class); + public IcPlacePatrolTeamStaffDTO get(String id) { + IcPlacePatrolTeamStaffEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcPlacePatrolTeamStaffDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(PlacePatrolTeamStaffDTO dto) { - PlacePatrolTeamStaffEntity entity = ConvertUtils.sourceToTarget(dto, PlacePatrolTeamStaffEntity.class); + public void save(IcPlacePatrolTeamStaffDTO dto) { + IcPlacePatrolTeamStaffEntity entity = ConvertUtils.sourceToTarget(dto, IcPlacePatrolTeamStaffEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(PlacePatrolTeamStaffDTO dto) { - PlacePatrolTeamStaffEntity entity = ConvertUtils.sourceToTarget(dto, PlacePatrolTeamStaffEntity.class); + public void update(IcPlacePatrolTeamStaffDTO dto) { + IcPlacePatrolTeamStaffEntity entity = ConvertUtils.sourceToTarget(dto, IcPlacePatrolTeamStaffEntity.class); updateById(entity); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PlaceOrgDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml similarity index 94% rename from epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PlaceOrgDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml index 7eae07e789..4d04a72530 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PlaceOrgDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlaceOrgDao.xml @@ -1,7 +1,7 @@ - + SELECT diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PlacePatrolTeamStaffDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamStaffDao.xml similarity index 77% rename from epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PlacePatrolTeamStaffDao.xml rename to epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamStaffDao.xml index 1c8abde218..5e63b8ee6d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/PlacePatrolTeamStaffDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPlacePatrolTeamStaffDao.xml @@ -1,7 +1,7 @@ - + DELETE @@ -11,7 +11,7 @@ place_patrol_team_id = #{teamId} - SELECT * FROM