diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaBmCategoryDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaBmCategoryDTO.java new file mode 100644 index 0000000000..52bf7b79a6 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaBmCategoryDTO.java @@ -0,0 +1,129 @@ +package com.epmet.opendata.dto.ca; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 多级类型信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +public class CaBmCategoryDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 类别ID + */ + private Long categoryId; + + /** + * 名称 + */ + private String categoryName; + + /** + * + */ + private String categoryType; + + /** + * 名称值 + */ + private String categoryValue; + + /** + * 父类别ID + */ + private Long parentCategoryId; + + /** + * 展示顺序 + */ + private Integer categorySort; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 最后修改人 + */ + private Long updateBy; + + /** + * 最后修改时间 + */ + private Date updateDate; + + /** + * 删除状态 + */ + private String deleteFlag; + + /** + * 乐观锁 + */ + private Integer versions; + + /** + * 扩展字段1 + */ + private String attribute1; + + /** + * 扩展字段2 + */ + private String attribute2; + + /** + * 扩展字段3 + */ + private String attribute3; + + /** + * 扩展字段4 + */ + private String attribute4; + + /** + * 扩展字段5 + */ + private String attribute5; + + /** + * 扩展字段6 + */ + private Long attribute6; + + /** + * 扩展字段7 + */ + private Long attribute7; + + /** + * 扩展字段8 + */ + private Long attribute8; + + /** + * 扩展字段9 + */ + private Date attribute9; + + /** + * 扩展字段10 + */ + private Date attribute10; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaSysDictDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaSysDictDTO.java new file mode 100644 index 0000000000..abb22af9f7 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ca/CaSysDictDTO.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.dto.ca; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 字典信息表，字典值和字典组均存入此表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +public class CaSysDictDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 字典ID + */ + private Long dictId; + + /** + * 字典值，例如：sex/F + */ + private String dictValue; + + /** + * 1.字典组名称（性别）或者字典名称（女） + */ + private String dictLabel; + + /** + * 字典值时存入字典的值，字典组时存null + */ + private String dictType; + + /** + * 描述 + */ + private String dictDesc; + + /** + * 排序 + */ + private Integer dictSort; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 最后修改人 + */ + private Long updateBy; + + /** + * 最后修改时间 + */ + private Date updateDate; + + /** + * 字典值：normal正常，deleted正常 + */ + private String deleteFlag; + + /** + * 乐观锁 + */ + private Integer versions; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index bab005732b..e8480a24e8 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -20,6 +20,7 @@ public interface CaWghDataConstant { String UNICOM_RESIDENT = "ca_resident"; String UNICOM_ROTATORS = "ca_rotators"; String UNICOM_RENTAL = "ca_rental"; + String UNICOM_BM_CATEGORY = "ca_bm_category"; String SHARE_BASE_GRID = "wgh_base_grid"; String SHARE_WGH_SUB = "wgh_subdistrict_office"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaBmCategoryController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaBmCategoryController.java new file mode 100644 index 0000000000..5c5034938b --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaBmCategoryController.java @@ -0,0 +1,96 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +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.opendata.dto.ca.CaBmCategoryDTO; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.excel.CaBmCategoryExcel; +import com.epmet.opendata.service.CaBmCategoryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 多级类型信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@RestController +@RequestMapping("caBmCategory") +public class CaBmCategoryController { + + @Autowired + private CaBmCategoryService caBmCategoryService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params) { + PageData page = caBmCategoryService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { + CaBmCategoryDTO data = caBmCategoryService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody CaBmCategoryDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + caBmCategoryService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody CaBmCategoryDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + caBmCategoryService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + caBmCategoryService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = caBmCategoryService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, CaBmCategoryExcel.class); + } + + /** + * 调用ruoyi接口存储数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/2 10:02 + */ + @PostMapping("/preserBmCategoryVation") + public Result getPreserLouDongVation(@RequestBody PreserVationFormDTO dto) { + caBmCategoryService.preserBmCategoryVation(dto); + return new Result(); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaSysDictController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaSysDictController.java new file mode 100644 index 0000000000..314302f346 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaSysDictController.java @@ -0,0 +1,83 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +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.opendata.dto.ca.CaSysDictDTO; +import com.epmet.opendata.excel.CaSysDictExcel; +import com.epmet.opendata.service.CaSysDictService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 字典信息表，字典值和字典组均存入此表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@RestController +@RequestMapping("caSysDict") +public class CaSysDictController { + + @Autowired + private CaSysDictService caSysDictService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = caSysDictService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + CaSysDictDTO data = caSysDictService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody CaSysDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + caSysDictService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody CaSysDictDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + caSysDictService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + caSysDictService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = caSysDictService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, CaSysDictExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaBmCategoryDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaBmCategoryDao.java new file mode 100644 index 0000000000..b09ea46440 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaBmCategoryDao.java @@ -0,0 +1,18 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.CaBmCategoryEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 多级类型信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface CaBmCategoryDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaSysDictDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaSysDictDao.java new file mode 100644 index 0000000000..91e682ed48 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaSysDictDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.CaSysDictEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 字典信息表，字典值和字典组均存入此表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Mapper +public interface CaSysDictDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaBmCategoryEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaBmCategoryEntity.java new file mode 100644 index 0000000000..bb2ecfb8ee --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaBmCategoryEntity.java @@ -0,0 +1,134 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 多级类型信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ca_bm_category") +public class CaBmCategoryEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 类别ID + */ + private Long categoryId; + + /** + * 名称 + */ + private String categoryName; + + /** + * + */ + private String categoryType; + + /** + * 名称值 + */ + private String categoryValue; + + /** + * 父类别ID + */ + private Long parentCategoryId; + + /** + * 展示顺序 + */ + private Integer categorySort; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 最后修改人 + */ + private Long updateBy; + + /** + * 最后修改时间 + */ + private Date updateDate; + + /** + * 删除状态 + */ + private String deleteFlag; + + /** + * 乐观锁 + */ + private Integer versions; + + /** + * 扩展字段1 + */ + private String attribute1; + + /** + * 扩展字段2 + */ + private String attribute2; + + /** + * 扩展字段3 + */ + private String attribute3; + + /** + * 扩展字段4 + */ + private String attribute4; + + /** + * 扩展字段5 + */ + private String attribute5; + + /** + * 扩展字段6 + */ + private Long attribute6; + + /** + * 扩展字段7 + */ + private Long attribute7; + + /** + * 扩展字段8 + */ + private Long attribute8; + + /** + * 扩展字段9 + */ + private Date attribute9; + + /** + * 扩展字段10 + */ + private Date attribute10; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaSysDictEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaSysDictEntity.java new file mode 100644 index 0000000000..0d9f7145b1 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CaSysDictEntity.java @@ -0,0 +1,84 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 字典信息表，字典值和字典组均存入此表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ca_sys_dict") +public class CaSysDictEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 字典ID + */ + private Long dictId; + + /** + * 字典值，例如：sex/F + */ + private String dictValue; + + /** + * 1.字典组名称（性别）或者字典名称（女） + */ + private String dictLabel; + + /** + * 字典值时存入字典的值，字典组时存null + */ + private String dictType; + + /** + * 描述 + */ + private String dictDesc; + + /** + * 排序 + */ + private Integer dictSort; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * 最后修改人 + */ + private Long updateBy; + + /** + * 最后修改时间 + */ + private Date updateDate; + + /** + * 字典值：normal正常，deleted正常 + */ + private String deleteFlag; + + /** + * 乐观锁 + */ + private Integer versions; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaBmCategoryExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaBmCategoryExcel.java new file mode 100644 index 0000000000..460df80eeb --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaBmCategoryExcel.java @@ -0,0 +1,84 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 多级类型信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +public class CaBmCategoryExcel { + + @Excel(name = "类别ID") + private Long categoryId; + + @Excel(name = "名称") + private String categoryName; + + @Excel(name = "") + private String categoryType; + + @Excel(name = "名称值") + private String categoryValue; + + @Excel(name = "父类别ID") + private Long parentCategoryId; + + @Excel(name = "展示顺序") + private Integer categorySort; + + @Excel(name = "创建人") + private Long createBy; + + @Excel(name = "创建时间") + private Date createDate; + + @Excel(name = "最后修改人") + private Long updateBy; + + @Excel(name = "最后修改时间") + private Date updateDate; + + @Excel(name = "删除状态") + private String deleteFlag; + + @Excel(name = "乐观锁") + private Integer versions; + + @Excel(name = "扩展字段1") + private String attribute1; + + @Excel(name = "扩展字段2") + private String attribute2; + + @Excel(name = "扩展字段3") + private String attribute3; + + @Excel(name = "扩展字段4") + private String attribute4; + + @Excel(name = "扩展字段5") + private String attribute5; + + @Excel(name = "扩展字段6") + private Long attribute6; + + @Excel(name = "扩展字段7") + private Long attribute7; + + @Excel(name = "扩展字段8") + private Long attribute8; + + @Excel(name = "扩展字段9") + private Date attribute9; + + @Excel(name = "扩展字段10") + private Date attribute10; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaSysDictExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaSysDictExcel.java new file mode 100644 index 0000000000..4e3b42a2da --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CaSysDictExcel.java @@ -0,0 +1,54 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 字典信息表，字典值和字典组均存入此表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Data +public class CaSysDictExcel { + + @Excel(name = "字典ID") + private Long dictId; + + @Excel(name = "字典值，例如：sex/F") + private String dictValue; + + @Excel(name = "1.字典组名称（性别）或者字典名称（女）") + private String dictLabel; + + @Excel(name = "字典值时存入字典的值，字典组时存null") + private String dictType; + + @Excel(name = "描述") + private String dictDesc; + + @Excel(name = "排序") + private Integer dictSort; + + @Excel(name = "创建人") + private Long createBy; + + @Excel(name = "创建时间") + private Date createDate; + + @Excel(name = "最后修改人") + private Long updateBy; + + @Excel(name = "最后修改时间") + private Date updateDate; + + @Excel(name = "字典值：normal正常，deleted正常") + private String deleteFlag; + + @Excel(name = "乐观锁") + private Integer versions; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaBmCategoryRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaBmCategoryRedis.java new file mode 100644 index 0000000000..c561019f41 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaBmCategoryRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 多级类型信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Component +public class CaBmCategoryRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaSysDictRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaSysDictRedis.java new file mode 100644 index 0000000000..3857e1803d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CaSysDictRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 字典信息表，字典值和字典组均存入此表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Component +public class CaSysDictRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaBmCategoryService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaBmCategoryService.java new file mode 100644 index 0000000000..5f0ff8d3eb --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaBmCategoryService.java @@ -0,0 +1,90 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.ca.CaBmCategoryDTO; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.entity.CaBmCategoryEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 多级类型信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +public interface CaBmCategoryService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-16 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-16 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return CaBmCategoryDTO + * @author generator + * @date 2022-06-16 + */ + CaBmCategoryDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void save(CaBmCategoryDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void update(CaBmCategoryDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-16 + */ + void delete(String[] ids); + + /** + * 调用ruoyi接口存储数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/16 16:38 + */ + void preserBmCategoryVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaSysDictService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaSysDictService.java new file mode 100644 index 0000000000..e7057b9646 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaSysDictService.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.ca.CaSysDictDTO; +import com.epmet.opendata.entity.CaSysDictEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 字典信息表，字典值和字典组均存入此表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +public interface CaSysDictService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-16 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-16 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return CaSysDictDTO + * @author generator + * @date 2022-06-16 + */ + CaSysDictDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void save(CaSysDictDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-16 + */ + void update(CaSysDictDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-16 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmCategoryServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmCategoryServiceImpl.java new file mode 100644 index 0000000000..6bc74d2e1b --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmCategoryServiceImpl.java @@ -0,0 +1,173 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; + +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.CaBmCategoryDao; +import com.epmet.opendata.dto.ca.CaBmCategoryDTO; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.entity.CaBmCategoryEntity; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.redis.CaBmCategoryRedis; +import com.epmet.opendata.service.CaBmCategoryService; +import com.epmet.opendata.util.AesUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 多级类型信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Service +public class CaBmCategoryServiceImpl extends BaseServiceImpl implements CaBmCategoryService { + + @Autowired + private CaBmCategoryRedis caBmCategoryRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, CaBmCategoryDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, CaBmCategoryDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public CaBmCategoryDTO get(String id) { + CaBmCategoryEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, CaBmCategoryDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(CaBmCategoryDTO dto) { + CaBmCategoryEntity entity = ConvertUtils.sourceToTarget(dto, CaBmCategoryEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(CaBmCategoryDTO dto) { + CaBmCategoryEntity entity = ConvertUtils.sourceToTarget(dto, CaBmCategoryEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi接口存储数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/16 16:38 + */ + @Override + public void preserBmCategoryVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); + dto.setTableName(CaWghDataConstant.UNICOM_BM_CATEGORY); + + dto.setWhereCase("delete_flag = 'normal'"); + dto.setOrderBy("category_id,parent_category_id,create_date,update_date"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listCategory(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + private int listCategory(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.UNICOM_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_UNICON, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaSysDictServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaSysDictServiceImpl.java new file mode 100644 index 0000000000..f1960a5274 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaSysDictServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.opendata.dao.CaSysDictDao; +import com.epmet.opendata.dto.ca.CaSysDictDTO; +import com.epmet.opendata.entity.CaSysDictEntity; +import com.epmet.opendata.redis.CaSysDictRedis; +import com.epmet.opendata.service.CaSysDictService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 字典信息表，字典值和字典组均存入此表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-16 + */ +@Service +public class CaSysDictServiceImpl extends BaseServiceImpl implements CaSysDictService { + + @Autowired + private CaSysDictRedis caSysDictRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, CaSysDictDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, CaSysDictDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public CaSysDictDTO get(String id) { + CaSysDictEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, CaSysDictDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(CaSysDictDTO dto) { + CaSysDictEntity entity = ConvertUtils.sourceToTarget(dto, CaSysDictEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(CaSysDictDTO dto) { + CaSysDictEntity entity = ConvertUtils.sourceToTarget(dto, CaSysDictEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaBmCategoryDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaBmCategoryDao.xml new file mode 100644 index 0000000000..01d9da165c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaBmCategoryDao.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + delete from ca_bm_category + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaSysDictDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaSysDictDao.xml new file mode 100644 index 0000000000..04194b5436 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaSysDictDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + +