diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 8f098d155..568a831e4 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 8f098d15559c1f17a9c507eac39475620b667ac2 +Subproject commit 568a831e4f4cd768f06bea9442509272fdc3d99d diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index c2860a574..4ee6a3054 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit c2860a57451957ccbea85110c23b820efad7c9b3 +Subproject commit 4ee6a3054b7c0cc5d5d36aa01abe5f6ae67663db diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java index ab65460a2..5a964f3b1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java @@ -2,12 +2,14 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; +import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.share.ShareEnterpriseDTO; import com.elink.esua.epdc.dto.share.form.ShareEnterpriseFormDTO; import com.elink.esua.epdc.dto.share.result.ShareEnterpriseResultDTO; import com.elink.esua.epdc.service.ItemService; @@ -143,7 +145,7 @@ public class ApiItemController { * @date 2022/9/15 16:10 */ @PostMapping("company") - public Result> getCompany(@RequestBody ShareEnterpriseFormDTO formDTO) { + public Result> getCompany(@RequestBody ShareEnterpriseFormDTO formDTO) { return itemService.getCompany(formDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java index 0a8c8948d..ec8533924 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java @@ -1,12 +1,14 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.share.ShareEnterpriseDTO; import com.elink.esua.epdc.dto.share.form.ShareEnterpriseFormDTO; import com.elink.esua.epdc.dto.share.result.ShareEnterpriseResultDTO; import com.elink.esua.epdc.feign.fallback.ItemFeignClientFallback; @@ -143,5 +145,5 @@ public interface ItemFeignClient { * @date 2022/9/15 16:06 */ @PostMapping(value = "events/shareenterprise/company", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> getCompany(ShareEnterpriseFormDTO formDTO); + Result> getCompany(ShareEnterpriseFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java index 61da20d08..d5f8cae20 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.form.*; @@ -8,6 +9,7 @@ import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.share.ShareEnterpriseDTO; import com.elink.esua.epdc.dto.share.form.ShareEnterpriseFormDTO; import com.elink.esua.epdc.dto.share.result.ShareEnterpriseResultDTO; import com.elink.esua.epdc.feign.ItemFeignClient; @@ -79,7 +81,7 @@ public class ItemFeignClientFallback implements ItemFeignClient { } @Override - public Result> getCompany(ShareEnterpriseFormDTO formDTO) { + public Result> getCompany(ShareEnterpriseFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getCompany", formDTO); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java index a2a26d3c9..dc1f6b233 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java @@ -1,12 +1,14 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.share.ShareEnterpriseDTO; import com.elink.esua.epdc.dto.share.form.ShareEnterpriseFormDTO; import com.elink.esua.epdc.dto.share.result.ShareEnterpriseResultDTO; @@ -124,5 +126,5 @@ public interface ItemService { * @author zhy * @date 2022/9/15 16:06 */ - Result> getCompany(ShareEnterpriseFormDTO formDTO); + Result> getCompany(ShareEnterpriseFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java index a2b3ec3f7..9ed658bc5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java @@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; +import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.form.PointLogFormDTO; @@ -14,6 +15,7 @@ import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO; import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO; import com.elink.esua.epdc.dto.item.result.ItemResultDTO; +import com.elink.esua.epdc.dto.share.ShareEnterpriseDTO; import com.elink.esua.epdc.dto.share.form.ShareEnterpriseFormDTO; import com.elink.esua.epdc.dto.share.result.ShareEnterpriseResultDTO; import com.elink.esua.epdc.feign.AdminFeignClient; @@ -221,7 +223,7 @@ public class ItemServiceImpl implements ItemService { } @Override - public Result> getCompany(ShareEnterpriseFormDTO formDTO){ + public Result> getCompany(ShareEnterpriseFormDTO formDTO){ return itemFeignClient.getCompany(formDTO); } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventZwyDataConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventZwyDataConstant.java index 940671ea9..2a8ae295d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventZwyDataConstant.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventZwyDataConstant.java @@ -46,13 +46,16 @@ public interface EventZwyDataConstant { String SHARE_WGH_SJXX = "wgh_sjxx"; + + String SHARE_QYDJ_JBXX = "qydj_jbxx_zs"; + /** * 政务云接口地址 */ String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; String DATA_URL_WGH = "http://120.221.72.83:9090/bridge/wgh/wghPage"; - String DATA_URL_COMPANY = "http://120.221.72.83:9090/bridge/company/page"; + String DATA_URL_COMPANY = "http://120.221.72.83:9090/bridge/share/company"; /** * 接口鉴权 @@ -60,6 +63,5 @@ public interface EventZwyDataConstant { String UNICOM_CONDITION = "unicomCondition"; String SHARE_CONDITION = "shareCondition"; String WGH_CONDITION = "wghCondition"; - String COMPANY_CONDITION = "companyCondition"; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/form/PreserVationFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/form/PreserVationFormDTO.java new file mode 100644 index 000000000..cf726e14b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/form/PreserVationFormDTO.java @@ -0,0 +1,41 @@ +package com.elink.esua.epdc.dto.share.form; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class PreserVationFormDTO implements Serializable { + + private static final long serialVersionUID = 3489407841261413891L; + + /** + * 表名 + */ + private String tableSchema; + + /** + * 表名 + */ + private String tableName; + + /** + * 页码 + */ + private Integer pageNo; + + /** + * 每页条数 + */ + private Integer pageSize; + + /** + * 查询条件 + */ + private String whereCase; + + /** + *排序字段 + */ + private String orderBy; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/form/ShareEnterpriseFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/form/ShareEnterpriseFormDTO.java index f123c4fc9..5aa782e39 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/form/ShareEnterpriseFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/share/form/ShareEnterpriseFormDTO.java @@ -46,4 +46,17 @@ public class ShareEnterpriseFormDTO implements Serializable { */ private String uniscid; + /** + * 页码 + */ + @NotBlank(message = "页码不能为空") + private String page; + + /** + * 页容量 + */ + @NotBlank(message = "页容量不能为空") + private String limit; + + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcPlatformItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcPlatformItemController.java index 371192144..c0618b9e0 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcPlatformItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/EpdcPlatformItemController.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.modules.item.controller; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.modules.item.service.ItemService; +import com.elink.esua.epdc.modules.share.service.ShareEnterpriseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -22,6 +23,9 @@ public class EpdcPlatformItemController { @Autowired private ItemService itemService; + @Autowired + private ShareEnterpriseService shareEnterpriseService; + /** * * 拉取市北网格化平台项目进度情况 @@ -59,6 +63,7 @@ public class EpdcPlatformItemController { */ @GetMapping(value = "company") public Result saveCompany() { + shareEnterpriseService.saveCompany(); return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index ef1fbb89f..47f5c7142 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -1794,6 +1794,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem sendDto.setSJZT(CommonConstants.PARTY_ITEM_ZT_ONE); } //备注 + log.info("上报网格化平台dto："+dto); sendDto.setBZXX(dto.getHandleAdvice()); Result deptResult = adminFeignClient.getDeptInfoCode(itemEntity.getGridId()); DeptInfoCodeDTO deptInfo = deptResult.getData(); @@ -2836,6 +2837,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemHandleSubmitFormDTO dto = new ItemHandleSubmitFormDTO(); dto.setId(formDto.getItemId()); dto.setOutHandleAdvice(process.getOutHandleAdvice()); + dto.setHandleAdvice(process.getOutHandleAdvice()); dto.setHandleCategory(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); sendItemToDsf(dto,process); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/controller/ShareEnterpriseController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/controller/ShareEnterpriseController.java index a90df2587..7d6d307b4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/controller/ShareEnterpriseController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/controller/ShareEnterpriseController.java @@ -84,9 +84,9 @@ public class ShareEnterpriseController { * @date 2022/9/15 16:13 */ @PostMapping("company") - public Result> getCompany(@RequestBody ShareEnterpriseFormDTO formDTO){ - List list = shareEnterpriseService.getCompany(formDTO); - return new Result>().ok(list); + public Result> getCompany(@RequestBody ShareEnterpriseFormDTO formDTO){ + PageData list = shareEnterpriseService.getCompany(formDTO); + return new Result>().ok(list); } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/dao/ShareEnterpriseDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/dao/ShareEnterpriseDao.java index a61127509..0da8f3056 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/dao/ShareEnterpriseDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/dao/ShareEnterpriseDao.java @@ -29,5 +29,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ShareEnterpriseDao extends BaseDao { + + /** + * 清空表 + * + * @param + * @return void + * @author zhy + * @date 2022/9/15 16:33 + */ + void deleteAll(); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/service/ShareEnterpriseService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/service/ShareEnterpriseService.java index 0364ebad7..28a7287b7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/service/ShareEnterpriseService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/service/ShareEnterpriseService.java @@ -73,7 +73,7 @@ public interface ShareEnterpriseService extends BaseService getCompany(ShareEnterpriseFormDTO formDTO); + PageData getCompany(ShareEnterpriseFormDTO formDTO); /** * 默认保存 @@ -104,4 +104,14 @@ public interface ShareEnterpriseService extends BaseService implements ShareEnterpriseService { + @Autowired + private HttpClientUtils httpClientUtils; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -82,11 +91,12 @@ public class ShareEnterpriseServiceImpl extends BaseServiceImpl getCompany(ShareEnterpriseFormDTO formDTO) { + public PageData getCompany(ShareEnterpriseFormDTO formDTO) { Map params = new HashMap<>(4); params.put("entName", formDTO.getEntName()); - List list = list(params); - return ConvertUtils.sourceToTarget(list, ShareEnterpriseResultDTO.class); + params.put("page", formDTO.getPage()); + params.put("limit", formDTO.getLimit()); + return page(params); } @Override @@ -110,4 +120,41 @@ public class ShareEnterpriseServiceImpl extends BaseServiceImpl()).getResult(); + if (null == data) { + throw new RenException("企业信息请求失败"); + } + JSONObject toResult = JSON.parseObject(data); + if (!toResult.containsKey("data")) { + throw new RenException("企业信息拉取失败"); + } + + JSONArray jsonArray = JSON.parseArray(toResult.get("data").toString()); + + List entityList = new ArrayList<>(); + if (jsonArray.size() > NumConstant.ZERO) { + jsonArray.forEach(item -> entityList.add(JSONObject.parseObject(JSONObject.toJSONString(item), ShareEnterpriseEntity.class))); + } + // 先清空表 + baseDao.deleteAll(); + // 批量插入 + insertBatch(entityList); + } catch (Exception e) { + throw new RuntimeException(e); + } + + + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/util/AesUtils.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/util/AesUtils.java new file mode 100644 index 000000000..df0987dd7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/share/util/AesUtils.java @@ -0,0 +1,78 @@ +package com.elink.esua.epdc.modules.share.util; + +import javax.crypto.Cipher; +import javax.crypto.spec.SecretKeySpec; + +/*** + * Aes加解密工具类 + * @author www + * @date 2022/6/6/0006 11:07 + */ +public class AesUtils { + + + public static String encryptByAES(String input, String key) throws Exception { + // 算法 + String algorithm = "AES"; + String transformation = "AES"; + // Cipher：密码，获取加密对象 + // transformation:参数表示使用什么类型加密 + Cipher cipher = Cipher.getInstance(transformation); + // 指定秘钥规则 + // 第一个参数表示：密钥，key的字节数组 长度必须是16位 + // 第二个参数表示：算法 + SecretKeySpec sks = new SecretKeySpec(key.getBytes(), algorithm); + // 对加密进行初始化 + // 第一个参数：表示模式，有加密模式和解密模式 + // 第二个参数：表示秘钥规则 + cipher.init(Cipher.ENCRYPT_MODE, sks); + // 进行加密 + byte[] bytes = cipher.doFinal(input.getBytes()); + return bytesToHexString(bytes); + } + + public static String decryptByAES(String input, String key) throws Exception { + // 算法 + String algorithm = "AES"; + String transformation = "AES"; + // Cipher：密码，获取加密对象 + // transformation:参数表示使用什么类型加密 + Cipher cipher = Cipher.getInstance(transformation); + // 指定秘钥规则 + // 第一个参数表示：密钥，key的字节数组 长度必须是16位 + // 第二个参数表示：算法 + SecretKeySpec sks = new SecretKeySpec(key.getBytes(), algorithm); + // 对加密进行初始化 + // 第一个参数：表示模式，有加密模式和解密模式 + // 第二个参数：表示秘钥规则 + cipher.init(Cipher.DECRYPT_MODE, sks); + // 进行解密 + byte[] inputBytes = hexStringToBytes(input); + byte[] bytes = cipher.doFinal(inputBytes); + return new String(bytes); + } + + private static byte[] hexStringToBytes(String hexString) { + if (hexString.length() % 2 != 0) throw new IllegalArgumentException("hexString length not valid"); + int length = hexString.length() / 2; + byte[] resultBytes = new byte[length]; + for (int index = 0; index < length; index++) { + String result = hexString.substring(index * 2, index * 2 + 2); + resultBytes[index] = Integer.valueOf(Integer.parseInt(result, 16)).byteValue(); + } + return resultBytes; + } + + private static String bytesToHexString(byte[] sources) { + if (sources == null) return null; + StringBuilder stringBuffer = new StringBuilder(); + for (byte source : sources) { + String result = Integer.toHexString(source & 0xff); + if (result.length() < 2) { + result = "0" + result; + } + stringBuffer.append(result); + } + return stringBuffer.toString(); + } +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 9af9370f1..d8ad75c8a 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -516,8 +516,13 @@ left join epdc_item_fusing_delay_record d on d.ITEM_ID = item.ID and d.DEL_FLAG = '0' left join ( select b.ID,b.ITEM_ID,b.CREATED_TIME,b.state - from epdc_item_handle_process b where b.STATE != 1001 and b.CREATED_TIME = ( - SELECT max(CREATED_TIME) from epdc_item_handle_process where b.ITEM_ID = ITEM_ID + from epdc_item_handle_process b where b.DEL_FLAG = '0' and b.STATE != 1001 and b.CREATED_TIME = ( + SELECT + max(CREATED_TIME) + from epdc_item_handle_process + where b.ITEM_ID = ITEM_ID + and HANDLER_DEPT != '网格化平台' + and DEL_FLAG = '0' ) ) process on process.ITEM_ID = item.ID WHERE item.DEL_FLAG = '0' diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/share/ShareEnterpriseDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/share/ShareEnterpriseDao.xml index 017d3b261..060ccaf9b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/share/ShareEnterpriseDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/share/ShareEnterpriseDao.xml @@ -15,5 +15,8 @@ + + truncate table epdc_share_enterprise; + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java index 43e04f0da..eb9b2b767 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java @@ -33,7 +33,7 @@ public interface ItemFeignClient { Result itemTimeOut(); /** - * 拉取市北政务网企业信息 + * 全量拉取市北政务网企业信息 * * @param * @return com.elink.esua.epdc.commons.tools.utils.Result diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemZwyTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemZwyTask.java new file mode 100644 index 000000000..f105255cd --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemZwyTask.java @@ -0,0 +1,20 @@ +package com.elink.esua.epdc.task.events; + +/** + * 政务云数据拉取 + * + * @author zhy + * @date 2022/9/16 10:52 + */ +public interface ItemZwyTask { + + /** + * + * + * @param params + * @return void + * @author zhy + * @date 2022/9/16 10:52 + */ + void run(String params); +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemZwyTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemZwyTaskImpl.java new file mode 100644 index 000000000..b971de4c2 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/events/ItemZwyTaskImpl.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.task.events; + +import com.elink.esua.epdc.feign.ItemFeignClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 政务云数据拉取 + * + * @author zhy + * @date 2022/9/16 10:52 + */ +@Component("ItemZwyTask") +public class ItemZwyTaskImpl implements ItemZwyTask { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private ItemFeignClient itemFeignClient; + + @Override + public void run(String params){ + logger.debug("ItemZwyTask定时任务正在执行，参数为：{}", params); + itemFeignClient.saveCompany(); + } +}