diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/CopywritingDao.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/CopywritingDao.java new file mode 100644 index 0000000..2812264 --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/CopywritingDao.java @@ -0,0 +1,9 @@ +package com.yuexiu.secp.read.model.dao; + +import com.sie.iot.common.model.dao.BaseCommonDAO_HI; +import com.yuexiu.secp.read.model.entities.CopywritingEntity; +import org.springframework.stereotype.Component; + +@Component("copywritingDao") +public interface CopywritingDao extends BaseCommonDAO_HI { +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/UnitUserDao.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/UnitUserDao.java new file mode 100644 index 0000000..7c6aa2b --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/UnitUserDao.java @@ -0,0 +1,9 @@ +package com.yuexiu.secp.read.model.dao; + +import com.sie.iot.common.model.dao.BaseCommonDAO_HI; +import com.yuexiu.secp.read.model.entities.UnitUserEntity; +import org.springframework.stereotype.Component; + +@Component("unitUserDao") +public interface UnitUserDao extends BaseCommonDAO_HI { +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/readonly/CopywritingDaoRO.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/readonly/CopywritingDaoRO.java new file mode 100644 index 0000000..a52035e --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/readonly/CopywritingDaoRO.java @@ -0,0 +1,9 @@ +package com.yuexiu.secp.read.model.dao.readonly; + +import com.siefw.hibernate.core.dao.DynamicViewObjectImpl; +import com.yuexiu.secp.read.model.entities.readonly.CopywritingEntityRO; +import org.springframework.stereotype.Component; + +@Component("copywritingDaoRO") +public interface CopywritingDaoRO extends DynamicViewObjectImpl { +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/readonly/UnitUserDaoRO.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/readonly/UnitUserDaoRO.java new file mode 100644 index 0000000..727b889 --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/dao/readonly/UnitUserDaoRO.java @@ -0,0 +1,9 @@ +package com.yuexiu.secp.read.model.dao.readonly; + +import com.siefw.hibernate.core.dao.DynamicViewObjectImpl; +import com.yuexiu.secp.read.model.entities.readonly.UnitUserEntityRO; +import org.springframework.stereotype.Component; + +@Component("unitUserDaoRO") +public interface UnitUserDaoRO extends DynamicViewObjectImpl { +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/CopywritingEntity.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/CopywritingEntity.java new file mode 100644 index 0000000..066cddc --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/CopywritingEntity.java @@ -0,0 +1,48 @@ +package com.yuexiu.secp.read.model.entities; + +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sie.iot.common.idgenerate.GeneratedKeyValue; +import com.sie.iot.common.model.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("yxh_copywriting") +@GeneratedKeyValue +@ApiModel(value = "文案维护") +public class CopywritingEntity extends BaseEntity implements Serializable { + @TableId(value = "copywriting_id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键id") + private Long copywritingId; + @ApiModelProperty(value = "文案标题") + private String copywritingTitle; + @ApiModelProperty(value = "文案作者") + private String copywritingAuthor; + @ApiModelProperty(value = "文案分类") + private Integer copywritingType; + @ApiModelProperty(value = "文案状态") + private Integer copywritingState; + @ApiModelProperty(value = "内容类型") + private Integer copywritingContentType; + @ApiModelProperty(value = "生效开始时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date takeBeginTime; + @ApiModelProperty(value = "生效结束时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date takeEndTime; + @ApiModelProperty(value = "提示样式图片") + private String tipsImg; + @ApiModelProperty(value = "文案概要") + private String copywritingOutline; + @ApiModelProperty(value = "文案内容") + private String copywritingConten; + @ApiModelProperty(value = "租户id") + private Long tenantId; +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/UnitUserEntity.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/UnitUserEntity.java new file mode 100644 index 0000000..9f33d26 --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/UnitUserEntity.java @@ -0,0 +1,34 @@ +package com.yuexiu.secp.read.model.entities; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sie.iot.common.idgenerate.GeneratedKeyValue; +import com.sie.iot.common.model.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@TableName("yxh_unit_user") +@GeneratedKeyValue +@ApiModel(value = "成本单位授权") +public class UnitUserEntity extends BaseEntity implements Serializable { + @TableId(value = "unit_user_id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键id") + private Long unitUserId; + @ApiModelProperty(value = "成本单位id") + private Long costUnitId; + @ApiModelProperty(value = "成本单位名称") + private String unitName; + @ApiModelProperty(value = "员工id") + private Long userId; + @ApiModelProperty(value = "员工编码") + private String employeeCustomCode; + @ApiModelProperty(value = "员工名称") + private String psnName; + @ApiModelProperty(value = "租户id") + private Long tenantId; +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/CopywritingEntityRO.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/CopywritingEntityRO.java new file mode 100644 index 0000000..01cbdd5 --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/CopywritingEntityRO.java @@ -0,0 +1,59 @@ +package com.yuexiu.secp.read.model.entities.readonly; + +import com.alibaba.fastjson.annotation.JSONField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@ApiModel(value = "成本单位") +public class CopywritingEntityRO implements Serializable { + + public static final String QUERY_SQL = " SELECT \n" + + " yc.copywriting_id as copywritingId,\n" + + " yc.copywriting_title as copywritingTitle,\n" + + " yc.copywriting_author as copywritingAuthor,\n" + + " yc.copywriting_type as copywritingType,\n" + + " yc.copywriting_state as copywritingState,\n" + + " yc.copywriting_content_type as copywritingContentType,\n" + + " yc.take_begin_time as takeBeginTime,\n" + + " yc.take_end_time as takeEndTime,\n" + + " yc.tips_img as tipsImg,\n" + + " yc.copywriting_outline as copywritingOutline,\n" + + " yc.copywriting_conten as copywritingConten,\n" + + " yc.tenant_id as tenantId\n" + + "FROM\n" + + " yxh_copywriting yc \n" + + "WHERE\n" + + " yc.delete_flag = 0 "; + + @ApiModelProperty(value = "主键id") + private Long copywritingId; + @ApiModelProperty(value = "文案标题") + private String copywritingTitle; + @ApiModelProperty(value = "文案作者") + private String copywritingAuthor; + @ApiModelProperty(value = "文案分类") + private Integer copywritingType; + @ApiModelProperty(value = "文案状态") + private Integer copywritingState; + @ApiModelProperty(value = "内容类型") + private Integer copywritingContentType; + @ApiModelProperty(value = "生效开始时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date takeBeginTime; + @ApiModelProperty(value = "生效结束时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date takeEndTime; + @ApiModelProperty(value = "提示样式图片") + private String tipsImg; + @ApiModelProperty(value = "文案概要") + private String copywritingOutline; + @ApiModelProperty(value = "文案内容") + private String copywritingConten; + @ApiModelProperty(value = "租户id") + private Long tenantId; +} diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/CostUnitEntityRO.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/CostUnitEntityRO.java index e9072f9..f60bfda 100644 --- a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/CostUnitEntityRO.java +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/CostUnitEntityRO.java @@ -10,19 +10,19 @@ import java.io.Serializable; import java.util.Date; @Data -@ApiModel(value = "成本单位") +@ApiModel(value = "文案维护") public class CostUnitEntityRO implements Serializable { public static final String QUERY_SQL = " SELECT\n" + - "scu.cost_unit_id,\n" + - "scu.unit_name,\n" + - "scu.tenant_id,\n" + - "scu.creation_date,\n" + - "scu.last_update_date\n" + + "ycu.cost_unit_id,\n" + + "ycu.unit_name,\n" + + "ycu.tenant_id,\n" + + "ycu.creation_date,\n" + + "ycu.last_update_date\n" + "FROM\n" + - "sie_cost_unit scu \n" + + "yxh_cost_unit ycu \n" + "WHERE\n" + - "scu.delete_flag = 0 "; + "ycu.delete_flag = 0 "; @ApiModelProperty(value = "主键id") private Long costUnitId; diff --git a/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/UnitUserEntityRO.java b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/UnitUserEntityRO.java new file mode 100644 index 0000000..69d81fb --- /dev/null +++ b/1068-yexiu-read-model-mybatis/src/main/java/com/yuexiu/secp/read/model/entities/readonly/UnitUserEntityRO.java @@ -0,0 +1,40 @@ +package com.yuexiu.secp.read.model.entities.readonly; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel(value = "成本单位授权") +public class UnitUserEntityRO implements Serializable { + + public static final String QUERY_SQL = " SELECT \n" + + " yuu.unit_user_id as unitUserId,\n" + + " yuu.cost_unit_id as costUnitId,\n" + + " yuu.unit_name as unitName,\n" + + " yuu.user_id as userId,\n" + + " yuu.employee_custom_code as employeeCustomCode,\n" + + " yuu.psn_name as psnName,\n" + + " yuu.tenant_id as tenantId\n" + + "FROM\n" + + " yxh_unit_user yuu \n" + + "WHERE\n" + + " yuu.delete_flag = 0 "; + + @ApiModelProperty(value = "主键id") + private Long unitUserId; + @ApiModelProperty(value = "成本单位id") + private Long costUnitId; + @ApiModelProperty(value = "成本单位名称") + private String unitName; + @ApiModelProperty(value = "员工id") + private Long userId; + @ApiModelProperty(value = "员工编码") + private String employeeCustomCode; + @ApiModelProperty(value = "员工名称") + private String psnName; + @ApiModelProperty(value = "租户id") + private Long tenantId; +} diff --git a/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/CopywritingDto.java b/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/CopywritingDto.java new file mode 100644 index 0000000..bcda0f6 --- /dev/null +++ b/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/CopywritingDto.java @@ -0,0 +1,38 @@ +package com.yuexiu.secp.read.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import com.sie.iot.common.bean.ReqeustCommonDataBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(value = "文案") +public class CopywritingDto extends ReqeustCommonDataBean { + @ApiModelProperty(value = "主键id") + private Long copywritingId; + @ApiModelProperty(value = "文案标题") + private String copywritingTitle; + @ApiModelProperty(value = "文案作者") + private String copywritingAuthor; + @ApiModelProperty(value = "文案分类") + private Integer copywritingType; + @ApiModelProperty(value = "文案状态") + private Integer copywritingState; + @ApiModelProperty(value = "内容类型") + private Integer copywritingContentType; + @ApiModelProperty(value = "生效开始时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date takeBeginTime; + @ApiModelProperty(value = "生效结束时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private Date takeEndTime; + @ApiModelProperty(value = "提示样式图片") + private String tipsImg; + @ApiModelProperty(value = "文案概要") + private String copywritingOutline; + @ApiModelProperty(value = "文案内容") + private String copywritingConten; +} diff --git a/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/CostUnitDto.java b/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/CostUnitDto.java index 332dcd8..5e4ec2b 100644 --- a/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/CostUnitDto.java +++ b/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/CostUnitDto.java @@ -14,6 +14,7 @@ public class CostUnitDto extends ReqeustCommonDataBean { private Long costUnitId; @ApiModelProperty(value = "成本单位名称") private String unitName; - @ApiModelProperty(value = "租户id") - private Long tenantId; + + @ApiModelProperty(value = "id以逗号分隔") + private String ids; } diff --git a/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/UnitUserDto.java b/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/UnitUserDto.java new file mode 100644 index 0000000..f7059b4 --- /dev/null +++ b/2068-yexiu-read-api/src/main/java/com/yuexiu/secp/read/dto/UnitUserDto.java @@ -0,0 +1,24 @@ +package com.yuexiu.secp.read.dto; + +import com.sie.iot.common.bean.ReqeustCommonDataBean; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "成本单位授权") +public class UnitUserDto extends ReqeustCommonDataBean { + + @ApiModelProperty(value = "主键id") + private Long unitUserId; + @ApiModelProperty(value = "成本单位id") + private Long costUnitId; + @ApiModelProperty(value = "成本单位名称") + private String unitName; + @ApiModelProperty(value = "员工id") + private Long userId; + @ApiModelProperty(value = "员工编码") + private String employeeCustomCode; + @ApiModelProperty(value = "员工名称") + private String psnName; +} diff --git a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/CopywritingController.java b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/CopywritingController.java new file mode 100644 index 0000000..c642291 --- /dev/null +++ b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/CopywritingController.java @@ -0,0 +1,99 @@ +package com.yuexiu.secp.read.controller; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; +import com.sie.iot.common.bean.PaginationRequestData; +import com.sie.iot.common.bean.RequestData; +import com.sie.iot.common.bean.ResponseData; +import com.sie.iot.common.iotenum.ResponseMsgCode; +import com.sie.iot.common.model.inter.IBaseCommon; +import com.sie.iot.common.secure.annotation.CheckToken; +import com.sie.iot.common.services.CommonAbstractService; +import com.siefw.hibernate.core.paging.Pagination; +import com.yuexiu.secp.read.dto.CopywritingDto; +import com.yuexiu.secp.read.model.entities.CopywritingEntity; +import com.yuexiu.secp.read.model.entities.readonly.CopywritingEntityRO; +import com.yuexiu.secp.read.model.service.ICopywriting; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Validated +@Api(value = "文案维护", tags = "文案维护") +@RestController +@RequestMapping("/copywritingController") +public class CopywritingController extends CommonAbstractService { + + @Autowired(required = true) + private ICopywriting copywritingServer; + + @Override + public IBaseCommon getBaseCommonServer() { + return this.copywritingServer; + } + + @ApiOperation(value = "分页查询文案", notes = "分页文案") + @PostMapping(value = "/findPaginationRO") + @CheckToken + public ResponseData> findPaginationRO(@RequestBody PaginationRequestData paginationRequestData) { + Integer pageIndex = paginationRequestData.getPageIndex(); + Integer pageRows = paginationRequestData.getPageRows(); + CopywritingDto copywritingDto = paginationRequestData.getParams(); + JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(copywritingDto)); + Pagination pagination = copywritingServer.findPaginationRO(jsonObject, pageIndex, pageRows, paginationRequestData.getOrderByBean()); + return ResponseData.data(pagination); + } + + @ApiOperation(value = "根据id文案信息", notes = "根据id文案信息") + @GetMapping(value = "/findById") + @CheckToken + public ResponseData findById(Long id) { + CopywritingEntity copywritingEntity = copywritingServer.getById(id); + return ResponseData.data(copywritingEntity); + } + + @ApiOperation(value = "保存文案", notes = "保存文案") + @PostMapping(value = "/save") + @CheckToken + public ResponseData save(@RequestBody RequestData requestData) { + CopywritingDto copywritingDto = requestData.getParams(); + CopywritingEntity copywritingEntity = JSONObject.parseObject(JSONObject.toJSONString(copywritingDto), CopywritingEntity.class); + //固定 + copywritingEntity.setOperatorUserId(getUserSessionBean().getUserId()); + copywritingEntity.setTenantId(getUserSessionBean().getTenantId()); + + copywritingServer.save(copywritingEntity); + return ResponseData.data(copywritingEntity); + } + + @PostMapping(value = "/update") + @CheckToken + public ResponseData update(@RequestBody RequestData requestData) { + CopywritingDto copywritingDto = requestData.getParams(); + CopywritingEntity copywritingEntity = copywritingServer.getById(copywritingDto.getCopywritingId()); + if (null != copywritingEntity) { + BeanUtil.copyProperties(copywritingDto, copywritingEntity); + //固定 + copywritingEntity.setOperatorUserId(getUserSessionBean().getUserId()); + } else { + return ResponseData.fail(ResponseMsgCode.UPDATE_DATA_NOT_EXIST.msgCode); + } + copywritingServer.update(copywritingEntity); + return ResponseData.data(copywritingEntity); + } + + @ApiOperation(value = "通过Id删除文案", notes = "通过Id删除文案") + @GetMapping(value = "/delete") + @CheckToken + public ResponseData deleteById(@RequestParam Long id) { + CopywritingEntity copywritingEntity = copywritingServer.getById(id); + if (copywritingEntity != null) { + copywritingEntity.setDeleteFlag(1); + copywritingEntity.setOperatorUserId(getUserSessionBean().getUserId()); + } + copywritingServer.update(copywritingEntity); + return ResponseData.success(); + } +} diff --git a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/CostUnitController.java b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/CostUnitController.java index 7bbe0bc..e263ef3 100644 --- a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/CostUnitController.java +++ b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/CostUnitController.java @@ -2,6 +2,7 @@ package com.yuexiu.secp.read.controller; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.sie.iot.common.bean.PaginationRequestData; import com.sie.iot.common.bean.RequestData; @@ -10,6 +11,7 @@ import com.sie.iot.common.iotenum.ResponseMsgCode; import com.sie.iot.common.model.inter.IBaseCommon; import com.sie.iot.common.secure.annotation.CheckToken; import com.sie.iot.common.services.CommonAbstractService; +import com.sie.iot.component.exception.ParameterNotValidException; import com.siefw.hibernate.core.paging.Pagination; import com.yuexiu.secp.read.dto.CostUnitDto; import com.yuexiu.secp.read.model.entities.CostUnitEntity; @@ -21,6 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Arrays; +import java.util.List; + @Validated @Api(value = "阅读有礼-成本单位", tags = "阅读有礼-成本单位") @RestController @@ -69,6 +74,7 @@ public class CostUnitController extends CommonAbstractService { return ResponseData.data(costUnitEntity); } + @ApiOperation(value = "修改成本单位", notes = "修改成本单位") @PostMapping(value = "/update") @CheckToken public ResponseData update(@RequestBody RequestData requestData) { @@ -97,4 +103,24 @@ public class CostUnitController extends CommonAbstractService { costUnitServer.update(costUnitEntity); return ResponseData.success(); } + + @ApiOperation(value = "批量删除成本单位", notes = "批量删除成本单位") + @PostMapping(value = "/deleteByIds") + @CheckToken + public ResponseData deleteByIds(@RequestBody RequestData requestData) throws ParameterNotValidException { + CostUnitDto costUnitDto = requestData.getParams(); + if(StrUtil.isEmpty(costUnitDto.getIds())){ + throw new ParameterNotValidException(); + } + List idList = Arrays.asList(costUnitDto.getIds().split(",")); + for (String id : idList) { + CostUnitEntity costUnitEntity = costUnitServer.getById(Long.parseLong(id)); + if (costUnitEntity != null) { + costUnitEntity.setDeleteFlag(1); + costUnitEntity.setOperatorUserId(getUserSessionBean().getUserId()); + } + costUnitServer.update(costUnitEntity); + } + return ResponseData.success(); + } } diff --git a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/UnitUserController.java b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/UnitUserController.java new file mode 100644 index 0000000..6649174 --- /dev/null +++ b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/controller/UnitUserController.java @@ -0,0 +1,99 @@ +package com.yuexiu.secp.read.controller; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSONObject; +import com.sie.iot.common.bean.PaginationRequestData; +import com.sie.iot.common.bean.RequestData; +import com.sie.iot.common.bean.ResponseData; +import com.sie.iot.common.iotenum.ResponseMsgCode; +import com.sie.iot.common.model.inter.IBaseCommon; +import com.sie.iot.common.secure.annotation.CheckToken; +import com.sie.iot.common.services.CommonAbstractService; +import com.siefw.hibernate.core.paging.Pagination; +import com.yuexiu.secp.read.dto.UnitUserDto; +import com.yuexiu.secp.read.model.entities.UnitUserEntity; +import com.yuexiu.secp.read.model.entities.readonly.UnitUserEntityRO; +import com.yuexiu.secp.read.model.service.IUnitUser; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Validated +@Api(value = "成本单位授权", tags = "成本单位授权") +@RestController +@RequestMapping("/unitUserController") +public class UnitUserController extends CommonAbstractService { + + @Autowired(required = true) + private IUnitUser unitUserServer; + + @Override + public IBaseCommon getBaseCommonServer() { + return this.unitUserServer; + } + + @ApiOperation(value = "分页查询成本单位授权", notes = "分页成本单位授权") + @PostMapping(value = "/findPaginationRO") + @CheckToken + public ResponseData> findPaginationRO(@RequestBody PaginationRequestData paginationRequestData) { + Integer pageIndex = paginationRequestData.getPageIndex(); + Integer pageRows = paginationRequestData.getPageRows(); + UnitUserDto unitUserDto = paginationRequestData.getParams(); + JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(unitUserDto)); + Pagination pagination = unitUserServer.findPaginationRO(jsonObject, pageIndex, pageRows, paginationRequestData.getOrderByBean()); + return ResponseData.data(pagination); + } + + @ApiOperation(value = "根据id成本单位授权信息", notes = "根据id成本单位授权信息") + @GetMapping(value = "/findById") + @CheckToken + public ResponseData findById(Long id) { + UnitUserEntity unitUserEntity = unitUserServer.getById(id); + return ResponseData.data(unitUserEntity); + } + + @ApiOperation(value = "保存成本单位授权", notes = "保存成本单位授权") + @PostMapping(value = "/save") + @CheckToken + public ResponseData save(@RequestBody RequestData requestData) { + UnitUserDto unitUserDto = requestData.getParams(); + UnitUserEntity unitUserEntity = JSONObject.parseObject(JSONObject.toJSONString(unitUserDto), UnitUserEntity.class); + //固定 + unitUserEntity.setOperatorUserId(getUserSessionBean().getUserId()); + unitUserEntity.setTenantId(getUserSessionBean().getTenantId()); + + unitUserServer.save(unitUserEntity); + return ResponseData.data(unitUserEntity); + } + + @PostMapping(value = "/update") + @CheckToken + public ResponseData update(@RequestBody RequestData requestData) { + UnitUserDto unitUserDto = requestData.getParams(); + UnitUserEntity unitUserEntity = unitUserServer.getById(unitUserDto.getUnitUserId()); + if (null != unitUserEntity) { + BeanUtil.copyProperties(unitUserDto, unitUserEntity); + //固定 + unitUserEntity.setOperatorUserId(getUserSessionBean().getUserId()); + } else { + return ResponseData.fail(ResponseMsgCode.UPDATE_DATA_NOT_EXIST.msgCode); + } + unitUserServer.update(unitUserEntity); + return ResponseData.data(unitUserEntity); + } + + @ApiOperation(value = "通过Id删除成本单位授权", notes = "通过Id删除成本单位授权") + @GetMapping(value = "/delete") + @CheckToken + public ResponseData deleteById(@RequestParam Long id) { + UnitUserEntity unitUserEntity = unitUserServer.getById(id); + if (unitUserEntity != null) { + unitUserEntity.setDeleteFlag(1); + unitUserEntity.setOperatorUserId(getUserSessionBean().getUserId()); + } + unitUserServer.update(unitUserEntity); + return ResponseData.success(); + } +} diff --git a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/ICopywriting.java b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/ICopywriting.java new file mode 100644 index 0000000..dcb0346 --- /dev/null +++ b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/ICopywriting.java @@ -0,0 +1,20 @@ +package com.yuexiu.secp.read.model.service; + +import com.alibaba.fastjson.JSONObject; +import com.sie.iot.common.bean.OrderByBean; +import com.sie.iot.common.model.inter.IBaseCommon; +import com.siefw.hibernate.core.paging.Pagination; +import com.yuexiu.secp.read.model.entities.CopywritingEntity; +import com.yuexiu.secp.read.model.entities.readonly.CopywritingEntityRO; + +public interface ICopywriting extends IBaseCommon { + /** + * 分页查询 文案 + * @param jsonObject + * @param pageIndex + * @param pageRows + * @param orderByBean + * @return + */ + Pagination findPaginationRO(JSONObject jsonObject, Integer pageIndex, Integer pageRows, OrderByBean orderByBean); +} diff --git a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/IUnitUser.java b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/IUnitUser.java new file mode 100644 index 0000000..6fef9c2 --- /dev/null +++ b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/IUnitUser.java @@ -0,0 +1,20 @@ +package com.yuexiu.secp.read.model.service; + +import com.alibaba.fastjson.JSONObject; +import com.sie.iot.common.bean.OrderByBean; +import com.sie.iot.common.model.inter.IBaseCommon; +import com.siefw.hibernate.core.paging.Pagination; +import com.yuexiu.secp.read.model.entities.UnitUserEntity; +import com.yuexiu.secp.read.model.entities.readonly.UnitUserEntityRO; + +public interface IUnitUser extends IBaseCommon { + /** + * 分页查询 成本单位授权 + * @param jsonObject + * @param pageIndex + * @param pageRows + * @param orderByBean + * @return + */ + Pagination findPaginationRO(JSONObject jsonObject, Integer pageIndex, Integer pageRows, OrderByBean orderByBean); +} diff --git a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/CopywritingServer.java b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/CopywritingServer.java new file mode 100644 index 0000000..8ecce55 --- /dev/null +++ b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/CopywritingServer.java @@ -0,0 +1,57 @@ +package com.yuexiu.secp.read.model.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.sie.iot.common.bean.OrderByBean; +import com.sie.iot.common.model.inter.server.BaseCommonServer; +import com.sie.iot.common.util.SaafToolUtils; +import com.siefw.hibernate.core.dao.ViewObject; +import com.siefw.hibernate.core.paging.Pagination; +import com.yuexiu.secp.read.model.dao.readonly.CopywritingDaoRO; +import com.yuexiu.secp.read.model.entities.CopywritingEntity; +import com.yuexiu.secp.read.model.entities.readonly.CopywritingEntityRO; +import com.yuexiu.secp.read.model.service.ICopywriting; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; + +@Component("copywritingServer") +public class CopywritingServer extends BaseCommonServer implements ICopywriting { + @Autowired + private ViewObject copywritingDao; + @Autowired + private CopywritingDaoRO copywritingDaoRO; + + /** + * 分页查询 文案 + * @param jsonObject + * @param pageIndex + * @param pageRows + * @param orderByBean + * @return + */ + @Override + public Pagination findPaginationRO(JSONObject jsonObject, Integer pageIndex, Integer pageRows, OrderByBean orderByBean) { + Map paramsMap = new HashMap(); + StringBuffer querySQL = new StringBuffer(CopywritingEntityRO.QUERY_SQL); + + //通过 文案标题 模糊查询 + if (StrUtil.isNotEmpty(jsonObject.getString("copywritingTitle"))) { + SaafToolUtils.parperParam(jsonObject, "yc.copywriting_title", "copywritingTitle", querySQL, paramsMap, "like"); + } + //通过 文案作者 模糊查询 + if (StrUtil.isNotEmpty(jsonObject.getString("copywritingAuthor"))) { + SaafToolUtils.parperParam(jsonObject, "yc.copywriting_author", "copywritingAuthor", querySQL, paramsMap, "like"); + } + //通过 文案状态 查询 + if (StrUtil.isNotEmpty(jsonObject.getString("copywritingState"))) { + SaafToolUtils.parperParam(jsonObject, "yc.copywriting_state", "copywritingState", querySQL, paramsMap, "="); + } + + SaafToolUtils.sortUtil(orderByBean, querySQL); + return copywritingDaoRO.findPagination(querySQL.toString(), paramsMap, pageIndex, pageRows); + } + +} diff --git a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/CostUnitServer.java b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/CostUnitServer.java index 48b4425..f5b3d79 100644 --- a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/CostUnitServer.java +++ b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/CostUnitServer.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.sie.iot.common.bean.OrderByBean; import com.sie.iot.common.model.inter.server.BaseCommonServer; import com.sie.iot.common.util.SaafToolUtils; +import com.siefw.base.utils.SToolUtils; import com.siefw.hibernate.core.dao.ViewObject; import com.siefw.hibernate.core.paging.Pagination; import com.yuexiu.secp.read.model.dao.readonly.CostUnitDaoRO; @@ -39,7 +40,7 @@ public class CostUnitServer extends BaseCommonServer implements //通过 成本单位名称 模糊查询 if (StrUtil.isNotEmpty(jsonObject.getString("unitName"))) { - SaafToolUtils.parperParam(jsonObject, "dept.unit_name", "unitName", querySQL, paramsMap, "like"); + SaafToolUtils.parperParam(jsonObject, "ycu.unit_name", "unitName", querySQL, paramsMap, "like"); } SaafToolUtils.sortUtil(orderByBean, querySQL); diff --git a/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/UnitUserServer.java b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/UnitUserServer.java new file mode 100644 index 0000000..fb9a815 --- /dev/null +++ b/2068-yexiu-read-application/src/main/java/com/yuexiu/secp/read/model/service/impl/UnitUserServer.java @@ -0,0 +1,42 @@ +package com.yuexiu.secp.read.model.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.sie.iot.common.bean.OrderByBean; +import com.sie.iot.common.model.inter.server.BaseCommonServer; +import com.sie.iot.common.util.SaafToolUtils; +import com.siefw.hibernate.core.dao.ViewObject; +import com.siefw.hibernate.core.paging.Pagination; +import com.yuexiu.secp.read.model.dao.readonly.UnitUserDaoRO; +import com.yuexiu.secp.read.model.entities.UnitUserEntity; +import com.yuexiu.secp.read.model.entities.readonly.UnitUserEntityRO; +import com.yuexiu.secp.read.model.service.IUnitUser; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; + +@Component("unitUserServer") +public class UnitUserServer extends BaseCommonServer implements IUnitUser { + @Autowired + private ViewObject unitUserDao; + @Autowired + private UnitUserDaoRO unitUserDaoRO; + + /** + * 分页查询 成本单位授权 + * @param jsonObject + * @param pageIndex + * @param pageRows + * @param orderByBean + * @return + */ + @Override + public Pagination findPaginationRO(JSONObject jsonObject, Integer pageIndex, Integer pageRows, OrderByBean orderByBean) { + Map paramsMap = new HashMap(); + StringBuffer querySQL = new StringBuffer(UnitUserEntityRO.QUERY_SQL); + + SaafToolUtils.sortUtil(orderByBean, querySQL); + return unitUserDaoRO.findPagination(querySQL.toString(), paramsMap, pageIndex, pageRows); + } +}