From 84d48102b9a7f3a11176169fbb8ac15a13298413 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Mon, 1 Jul 2024 15:48:50 +0800 Subject: [PATCH] bugfix --- .../jjh/common/entity/BaseInfoEntity.java | 2 +- .../BmsDeclarationRecordsController.java | 19 +- .../BmsEnterpriseBasicInfoController.java | 70 ++-- .../controller/BmsTemplateInfoController.java | 17 +- .../BmsTemplateRecordController.java | 15 +- .../entity/BmsEnterpriseBasicInfo.java | 385 +++++++++++++----- .../mapper/BmsEnterpriseBasicInfoMapper.java | 43 +- .../jjh/declaration/regular/TimeChange.java | 120 +++++- .../IBmsEnterpriseBasicInfoService.java | 42 +- .../impl/BmsBigStrongAwardServiceImpl.java | 4 +- .../impl/BmsBrandingAwardServiceImpl.java | 4 +- ...msCarrierConstructionAwardServiceImpl.java | 4 +- .../impl/BmsCreditManagementServiceImpl.java | 4 +- .../BmsDeclarationRecordsServiceImpl.java | 2 +- .../BmsEnterpriseBasicInfoServiceImpl.java | 59 +-- ...BmsIndustrialInternetAwardServiceImpl.java | 4 +- .../BmsIntegrationIndustriesServiceImpl.java | 4 +- ...sLogisticsDevelopmentAwardServiceImpl.java | 4 +- ...ManufacturingServicesAwardServiceImpl.java | 4 +- .../impl/BmsOutQuitProductsServiceImpl.java | 4 +- ...sPlatformConstructionAwardServiceImpl.java | 4 +- .../BmsProjectSettlementAwardServiceImpl.java | 4 +- .../impl/BmsSceneOpeningAwardServiceImpl.java | 4 +- .../impl/BmsTemplateRecordServiceImpl.java | 22 +- .../service/impl/CommonServiceImpl.java | 6 +- .../impl/OpenInterfaceServiceImpl.java | 4 +- .../ent/controller/JContactsController.java | 66 +-- .../JEnterpriseContactController.java | 22 + .../ent/controller/JMemorandumController.java | 21 + .../ent/controller/JProjectController.java | 40 ++ .../controller/JSmartRemindersController.java | 100 +++++ .../com/ruoyi/jjh/ent/entity/JContacts.java | 154 +++++-- .../ruoyi/jjh/ent/entity/JSmartReminders.java | 91 +++++ .../ent/entity/request/JContactsRequest.java | 23 ++ .../ruoyi/jjh/ent/mapper/JContactsMapper.java | 3 +- .../jjh/ent/mapper/JSmartRemindersMapper.java | 25 ++ .../jjh/ent/service/JContactsService.java | 5 +- .../jjh/ent/service/JProjectService.java | 13 + .../ent/service/JSmartRemindersService.java | 31 ++ .../jjh/ent/service/impl/JContactsImpl.java | 3 +- .../ent/service/impl/JProjectServiceImpl.java | 50 +++ .../impl/JSmartRemindersServiceImpl.java | 59 +++ .../src/main/resources/application-druid.yml | 2 + .../main/resources/application-internet.yml | 3 +- .../src/main/resources/application.yml | 4 +- .../BmsDeclarationRecordsMapper.xml | 16 +- .../BmsEnterpriseBasicInfoMapper.xml | 163 +------- .../mapper/jjh/ent/JContactsMapper.xml | 5 +- .../mapper/jjh/ent/JSmartRemindersMapper.xml | 17 + .../framework/config/SecurityConfig.java | 3 + 50 files changed, 1213 insertions(+), 560 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JSmartReminders.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JContactsRequest.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JSmartRemindersMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JSmartRemindersService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartRemindersServiceImpl.java create mode 100644 ruoyi-admin/src/main/resources/mapper/jjh/ent/JSmartRemindersMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/common/entity/BaseInfoEntity.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/common/entity/BaseInfoEntity.java index cc5f212..6c49198 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/common/entity/BaseInfoEntity.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/common/entity/BaseInfoEntity.java @@ -46,7 +46,7 @@ public class BaseInfoEntity implements Serializable { */ @JSONField(serialize=false) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField(fill = FieldFill.UPDATE) + @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java index 15e1021..979eea1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsDeclarationRecordsController.java @@ -8,6 +8,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.jjh.declaration.entity.BmsDeclarationRecords; import com.ruoyi.jjh.declaration.entity.dto.ApprovalDeclarationRecordsQueryDto; @@ -26,6 +27,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -69,6 +71,7 @@ public class BmsDeclarationRecordsController extends BaseController { * @create 2023/9/9 14:41 */ @ApiOperation(value = "审核列表") + @PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')") @GetMapping("/approvalList") public TableDataInfo approvalList(ApprovalDeclarationRecordsQueryDto approvalDeclarationRecordsQueryDto) { startPage(); @@ -77,6 +80,7 @@ public class BmsDeclarationRecordsController extends BaseController { } @ApiOperation(value = "审批记录信息") + @PreAuthorize("@ss.hasAnyRoles('admin,gov')") @Log(title = "审批记录信息", businessType = BusinessType.UPDATE) @PutMapping("/approvalEdit") public AjaxResult approvalEdit(@RequestBody BmsApprovalInfoUpdateDto bmsApprovalInfoUpdateDto) { @@ -86,10 +90,23 @@ public class BmsDeclarationRecordsController extends BaseController { /** * 查询在线申报记录列表 */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')") @ApiOperation(value = "查询在线申报记录列表") -// @RequiresPermissions("system:declarationRecords:list") @GetMapping("/list") public TableDataInfo list(BmsDeclarationRecordsDto bmsDeclarationRecordsDto) { + // 获取当前登录用户是否是企业端 + boolean admin = false; + boolean b = false; + String str = null; + try { + admin = SecurityUtils.isAdmin(SecurityUtils.getUserId()); + b = SecurityUtils.hasRole("ent"); + str =SecurityUtils.getUsername(); + } catch (Exception ignored) { + } + if(!admin && b){ + bmsDeclarationRecordsDto.setCreditCode(str); + } startPage(); List list = bmsDeclarationRecordsService.selectBmsDeclarationRecordsList(bmsDeclarationRecordsDto); return getDataTable(list); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java index ba9a230..07ef5b6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java @@ -1,6 +1,8 @@ package com.ruoyi.jjh.declaration.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; @@ -9,12 +11,14 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest; +import com.ruoyi.jjh.declaration.mapper.BmsEnterpriseBasicInfoMapper; import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; import com.ruoyi.jjh.ent.entity.JMemorandum; import com.ruoyi.jjh.ent.entity.JProject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -35,21 +39,21 @@ public class BmsEnterpriseBasicInfoController extends BaseController { @Autowired private IBmsEnterpriseBasicInfoService bmsEnterpriseBasicInfoService; + /** * 查询企业基础信息列表 */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @ApiOperation(value = "查询企业基础信息列表", response = BmsEnterpriseBasicInfo.class) -// @RequiresPermissions("system:enterpriseBasicInfo:list") @GetMapping("/list") - public TableDataInfo list(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { - startPage(); - List list = bmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoList(bmsEnterpriseBasicInfo); - return getDataTable(list); + public AjaxResult list(Page page,BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { + return success(bmsEnterpriseBasicInfoService.page(page, bmsEnterpriseBasicInfo)); } /** * 作业台查询企业信息 */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @ApiOperation(value = "作业台查询企业信息" ,response = BmsEnterpriseBasicInfo.class) @GetMapping("/workSearch") public AjaxResult workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) { @@ -59,11 +63,12 @@ public class BmsEnterpriseBasicInfoController extends BaseController { /** * 导出企业基础信息列表 */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @ApiOperation(value = "导出企业基础信息列表") @Log(title = "企业基础信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { - List list = bmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoList(bmsEnterpriseBasicInfo); + List list = bmsEnterpriseBasicInfoService.page(bmsEnterpriseBasicInfo); ExcelUtil util = new ExcelUtil(BmsEnterpriseBasicInfo.class); util.exportExcel(response, list, "企业基础信息数据"); } @@ -71,6 +76,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController { /** * 导入企业基础信息列表 */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @ApiOperation(value = "导入企业基础信息列表") @Log(title = "导入企业基础信息列表", businessType = BusinessType.IMPORT) @PostMapping(value = "/importEnterprise", consumes = "multipart/form-data") @@ -82,7 +88,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController { if (proList == null || proList.isEmpty()) { throw new ServiceException("企业导入数据不能为空"); } else { - proList.removeIf(entityA -> allList.stream().anyMatch(entityB -> entityB.getCreditCode().equals(entityA.getCreditCode()))); + proList.removeIf(entityA -> allList.stream().anyMatch(entityB -> entityB.getTyshxydm().equals(entityA.getTyshxydm()))); bmsEnterpriseBasicInfoService.saveBatch(proList); successMsg.append("导入成功"); } @@ -93,9 +99,22 @@ public class BmsEnterpriseBasicInfoController extends BaseController { * 根据信用代码获取该企业id */ @ApiOperation(value = "根据信用代码获取该企业id" ,response = BmsEnterpriseBasicInfo.class) -// @RequiresPermissions("system:enterpriseBasicInfo:query") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')") @GetMapping(value = "/getCreditCode") public AjaxResult getCreditCode(@RequestParam String getCreditCode) { + // 获取当前登录用户是否是企业端 + boolean admin = false; + boolean b = false; + String str = null; + try { + admin = SecurityUtils.isAdmin(SecurityUtils.getUserId()); + b = SecurityUtils.hasRole("ent"); + str =SecurityUtils.getUsername(); + } catch (Exception ignored) { + } + if(!admin && b){ + getCreditCode=str; + } return success(bmsEnterpriseBasicInfoService.selectGetCreditCode(getCreditCode)); } @@ -103,41 +122,10 @@ public class BmsEnterpriseBasicInfoController extends BaseController { * 获取企业基础信息详细信息 */ @ApiOperation(value = "获取企业基础信息详细信息" ,response = BmsEnterpriseBasicInfo.class) -// @RequiresPermissions("system:enterpriseBasicInfo:query") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(bmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoById(id)); - } - - /** - * 新增企业基础信息 - */ - @ApiOperation(value = "新增企业基础信息") - @Log(title = "企业基础信息", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { - return toAjax(bmsEnterpriseBasicInfoService.insertBmsEnterpriseBasicInfo(bmsEnterpriseBasicInfo)); + return success(bmsEnterpriseBasicInfoService.getById(id)); } - /** - * 修改企业基础信息 - */ - @ApiOperation(value = "修改企业基础信息") -// @RequiresPermissions("system:enterpriseBasicInfo:edit") - @Log(title = "企业基础信息", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { - return toAjax(bmsEnterpriseBasicInfoService.updateBmsEnterpriseBasicInfo(bmsEnterpriseBasicInfo)); - } - - /** - * 删除企业基础信息 - */ - @ApiOperation(value = "删除企业基础信息") -// @RequiresPermissions("system:enterpriseBasicInfo:remove") - @Log(title = "企业基础信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(bmsEnterpriseBasicInfoService.deleteBmsEnterpriseBasicInfoByIds(ids)); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java index 62a7a9d..9b82845 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateInfoController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -43,7 +44,7 @@ public class BmsTemplateInfoController extends BaseController { /** * 查询申报模板信息列表 */ -// @RequiresPermissions("system:templateInfo:list") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @GetMapping("/list") @ApiOperation(value = "查询申报模板信息列表", response = BmsTemplateInfo.class) public TableDataInfo list(BmsTemplateInfo bmsTemplateInfo) { @@ -55,7 +56,7 @@ public class BmsTemplateInfoController extends BaseController { /** * 新增项目时查询所有模板信息 */ -// @RequiresPermissions("system:templateInfo:list") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @GetMapping("/allList") @ApiOperation(value = "新增项目时查询所有模板信息", response = BmsTemplateInfoQueryVo.class) public AjaxResult allList(BmsTemplateInfo bmsTemplateInfo) { @@ -67,7 +68,7 @@ public class BmsTemplateInfoController extends BaseController { /** * 导出申报模板信息列表 */ -// @RequiresPermissions("system:templateInfo:export") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @Log(title = "申报模板信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, BmsTemplateInfo bmsTemplateInfo) { @@ -76,7 +77,7 @@ public class BmsTemplateInfoController extends BaseController { util.exportExcel(response, list, "申报模板信息数据"); } -// @RequiresPermissions("system:templateInfo:exportTemplate") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @Log(title = "导出模板表单", businessType = BusinessType.EXPORT) @GetMapping(value = "/exportTemplate/{id}") public void exportTemplate(HttpServletRequest request, HttpServletResponse response,@PathVariable("id")Long id){ @@ -86,7 +87,7 @@ public class BmsTemplateInfoController extends BaseController { /** * 获取申报模板信息详细信息 */ -// @RequiresPermissions("system:templateInfo:query") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { return success(bmsTemplateInfoService.selectBmsTemplateInfoById(id)); @@ -95,7 +96,7 @@ public class BmsTemplateInfoController extends BaseController { /** * 新增申报模板信息 */ -// @RequiresPermissions("system:templateInfo:add") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @Log(title = "申报模板信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BmsTemplateInfo bmsTemplateInfo) { @@ -105,7 +106,7 @@ public class BmsTemplateInfoController extends BaseController { /** * 修改申报模板信息 */ -// @RequiresPermissions("system:templateInfo:edit") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @Log(title = "申报模板信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody BmsTemplateInfo bmsTemplateInfo) { @@ -115,7 +116,7 @@ public class BmsTemplateInfoController extends BaseController { /** * 删除申报模板信息 */ -// @RequiresPermissions("system:templateInfo:remove") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @Log(title = "申报模板信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java index f7904e3..e5c8519 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsTemplateRecordController.java @@ -18,6 +18,7 @@ import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -39,7 +40,7 @@ public class BmsTemplateRecordController extends BaseController { /** * 查询在线模板列表 */ -// @RequiresPermissions("system:templateRecord:list") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @GetMapping("/list") @ApiOperation(value = "查询在线模板记录列表",response = BmsTemplateRecordQueryVo.class) public AjaxResult list(Page page,BmsTemplateRecordQueryDto bmsTemplateRecordQueryDto) { @@ -51,6 +52,7 @@ public class BmsTemplateRecordController extends BaseController { * @param bmsTemplateQueryDto * @return */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @ApiOperation(value = "企业端选择表单模板列表") @GetMapping("/templateNameList") public TableDataInfo templateNameList(BmsTemplateQueryDto bmsTemplateQueryDto){ @@ -64,6 +66,7 @@ public class BmsTemplateRecordController extends BaseController { * @param bmsTemplateRecordUpdateDto * @return */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @ApiOperation(value = "补录") @PostMapping ("/supplementation") public AjaxResult supplementation(@RequestBody BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) { @@ -73,7 +76,7 @@ public class BmsTemplateRecordController extends BaseController { /** * 导出在线模板列表 */ -// @RequiresPermissions("system:templateRecord:export") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @Log(title = "在线模板", businessType = BusinessType.EXPORT) @ApiOperation(value = "导出在线模板列表") @PostMapping("/export") @@ -87,7 +90,7 @@ public class BmsTemplateRecordController extends BaseController { * 获取在线模板详细信息 */ @ApiOperation(value = "获取在线模板详细信息") -// @RequiresPermissions("system:templateRecord:query") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { return success(bmsTemplateRecordService.selectBmsTemplateRecordById(id)); @@ -97,7 +100,7 @@ public class BmsTemplateRecordController extends BaseController { * 新增在线模板 */ @ApiOperation(value = "新增在线模板") -// @RequiresPermissions("system:templateRecord:add") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @Log(title = "在线模板", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody BmsTemplateRecordAddDto bmsTemplateRecordAddDto) { @@ -110,7 +113,7 @@ public class BmsTemplateRecordController extends BaseController { * 修改在线模板 */ @ApiOperation(value = "修改在线模板") -// @RequiresPermissions("system:templateRecord:edit") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @Log(title = "在线模板", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody BmsTemplateRecordUpdateDto bmsTemplateRecordUpdateDto) { @@ -121,7 +124,7 @@ public class BmsTemplateRecordController extends BaseController { * 删除在线模板 */ @ApiOperation(value = "删除在线模板") -// @RequiresPermissions("system:templateRecord:remove") + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @Log(title = "在线模板", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java index 658d322..bfea5ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java @@ -1,7 +1,9 @@ package com.ruoyi.jjh.declaration.entity; import com.alibaba.fastjson2.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.annotation.Excel; import com.ruoyi.jjh.common.entity.BaseInfoEntity; @@ -32,13 +34,42 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity { @TableId(value = "id", type = IdType.AUTO) private Long id; + /** + * 有几个法人 + */ + private Integer multiple; + + /** + * 源主键 + */ + @ApiModelProperty("源主键") + @JSONField(name = "源主键") + @Excel(name = "源主键") + private String ywid; + + /** + * 源表org + */ + @ApiModelProperty("源表org") + @JSONField(name = "源表org") + @Excel(name = "源表org") + private String org; + /** * 企业名称 */ - @ApiModelProperty("单位名称") - @JSONField(name = "单位名称") - @Excel(name = "单位名称") - private String enterpriseName; + @ApiModelProperty("企业名称") + @JSONField(name = "企业名称") + @Excel(name = "企业名称") + private String qymc; + + /** + * 标识证号 + */ + @ApiModelProperty("标识证号") + @JSONField(name = "标识证号") + @Excel(name = "标识证号") + private String bszh; /** * 统一社会信用代码 @@ -46,64 +77,103 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity { @ApiModelProperty("统一社会信用代码") @JSONField(name = "统一社会信用代码") @Excel(name = "统一社会信用代码") - private String creditCode; + private String tyshxydm; + /** + * 企业注册号 + */ + @ApiModelProperty("企业注册号") + @JSONField(name = "企业注册号") + @Excel(name = "企业注册号") + private String qyzch; /** - * 法定代表人 + * 组织机构代码 */ - @ApiModelProperty("法定代表人") - @JSONField(name = "法定代表人") - @Excel(name = "法定代表人") - private String legalEntity; + @ApiModelProperty("组织机构代码") + @JSONField(name = "组织机构代码") + @Excel(name = "组织机构代码") + private String zzjgdm; /** - * 经营状态 + * 经济类型代码 */ - @ApiModelProperty("经营状态") - @JSONField(name = "经营状态") - @Excel(name = "经营状态") - private String businessStatus; + @ApiModelProperty("经济类型代码") + @JSONField(name = "经济类型代码") + @Excel(name = "经济类型代码") + private String jjlxdm; /** - * 成立日期 + * 经济类型名称 */ - @ApiModelProperty("成立日期") - @JSONField(name = "成立日期") - @Excel(name = "成立日期") - private String establishDate; + @ApiModelProperty("经济类型名称") + @JSONField(name = "经济类型名称") + @Excel(name = "经济类型名称") + private String jjlxmc; /** - * 注册资本 + * 企业类型代码 */ - @ApiModelProperty("注册资本") - @JSONField(name = "注册资本") - @Excel(name = "注册资本") - private String registeredCapital; + @ApiModelProperty("企业类型代码") + @JSONField(name = "企业类型代码") + @Excel(name = "企业类型代码") + private String qylxdm; /** - * 企业类型 + * 企业类型名称 */ - @ApiModelProperty("企业类型") - @JSONField(name = "企业类型") - @Excel(name = "企业类型") - private String enterpriseType; + @ApiModelProperty("企业类型名称") + @JSONField(name = "企业类型名称") + @Excel(name = "企业类型名称") + private String qylxmc; /** - * 所属行业 + * 注册资金 */ - @ApiModelProperty("所属行业") - @JSONField(name = "所属行业") - @Excel(name = "所属行业") - private String industry; + @ApiModelProperty("注册资金") + @JSONField(name = "注册资金") + @Excel(name = "注册资金") + private String zczj; /** - * 组织机构代码 + * 注册资本币种 */ - @ApiModelProperty("组织机构代码") - @JSONField(name = "组织机构代码") - @Excel(name = "组织机构代码") - private String institutionCode; + @ApiModelProperty("注册资本币种") + @JSONField(name = "注册资本币种") + @Excel(name = "注册资本币种") + private String zczbbz; + + /** + * 注册类型 + */ + @ApiModelProperty("注册类型") + @JSONField(name = "注册类型") + @Excel(name = "注册类型") + private String zclx; + + /** + * 经营范围 + */ + @ApiModelProperty("经营范围") + @JSONField(name = "经营范围") + @Excel(name = "经营范围") + private String jyfw; + + /** + * 经营或营业起始日期 + */ + @ApiModelProperty("经营或营业起始日期") + @JSONField(name = "经营或营业起始日期") + @Excel(name = "经营或营业起始日期") + private String jyhyyqsrq; + + /** + * 经营或营业截止日期 + */ + @ApiModelProperty("经营或营业截止日期") + @JSONField(name = "经营或营业截止日期") + @Excel(name = "经营或营业截止日期") + private String jyhyyjzrq; /** * 行业代码 @@ -111,77 +181,207 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity { @ApiModelProperty("行业代码") @JSONField(name = "行业代码") @Excel(name = "行业代码") - private String industryCode; + private String hydm; /** - * 登记注册统计类别 + * 行业名称 */ - @ApiModelProperty("登记注册统计类别") - @JSONField(name = "登记注册统计类别") - @Excel(name = "登记注册统计类别") - private String statisticalCategories; + @ApiModelProperty("行业名称") + @JSONField(name = "行业名称") + @Excel(name = "行业名称") + private String hymc; /** - * 参保人数 + * 行业门类 */ - @ApiModelProperty("参保人数") - @JSONField(name = "参保人数") - @Excel(name = "参保人数") - private String visitorsNum; + @ApiModelProperty("行业门类") + @JSONField(name = "行业门类") + @Excel(name = "行业门类") + private String hyml; /** - * 曾用名 + * 产业类型 */ - @ApiModelProperty("曾用名") - @JSONField(name = "曾用名") - @Excel(name = "曾用名") - private String formerName; + @ApiModelProperty("产业类型") + @JSONField(name = "产业类型") + @Excel(name = "产业类型") + private String cylx; /** - * 注册地址 + * 企业住所 */ - @ApiModelProperty("注册地址") - @JSONField(name = "注册地址") - @Excel(name = "注册地址") - private String enrollAddress; + @ApiModelProperty("企业住所") + @JSONField(name = "企业住所") + @Excel(name = "企业住所") + private String qyzs; + /** + * 经营场所 + */ + @ApiModelProperty("经营场所") + @JSONField(name = "经营场所") + @Excel(name = "经营场所") + private String jycs; /** - * 注册类型 + * 经营场所行政区划 */ - @ApiModelProperty("注册类型") - @JSONField(name = "注册类型") - @Excel(name = "注册类型") - private String enrollType; + @ApiModelProperty("经营场所行政区划") + @JSONField(name = "经营场所行政区划") + @Excel(name = "经营场所行政区划") + private String jycsxzqh; /** - * 经营范围 + * 邮政编码 */ - @ApiModelProperty("经营范围") - @JSONField(name = "经营范围") - @Excel(name = "经营范围") - private String business; - -// /** -// * 联系人 -// */ -// @JSONField(name = "联系人") -// @Excel(name = "联系人") -// private String contacts; -// -// /** -// * 联系人电话 -// */ -// @JSONField(name = "联系人电话") -// @Excel(name = "联系人电话") -// private String contactsNumber; -// -// /** -// * 企业地址 -// */ -// @JSONField(name = "企业地址") -// @Excel(name = "企业地址") -// private String address; + @ApiModelProperty("邮政编码") + @JSONField(name = "邮政编码") + @Excel(name = "邮政编码") + private String yzbm; + + /** + * 成立日期 + */ + @ApiModelProperty("成立日期") + @JSONField(name = "成立日期") + @Excel(name = "成立日期") + private String clrq; + + /** + * 信用等级 + */ + @ApiModelProperty("信用等级") + @JSONField(name = "信用等级") + @Excel(name = "信用等级") + private String xydj; + + /** + * 企业规模 + */ + @ApiModelProperty("企业规模") + @JSONField(name = "企业规模") + @Excel(name = "企业规模") + private String qygm; + + /** + * 法定代表人姓名 + */ + @ApiModelProperty("法定代表人姓名") + @JSONField(name = "法定代表人姓名") + @Excel(name = "法定代表人姓名") + private String fddbrxm; + + /** + * 法定代表人证件号码 + */ + @ApiModelProperty("法定代表人证件号码") + @JSONField(name = "法定代表人证件号码") + @Excel(name = "法定代表人证件号码") + private String fddbrzjhm; + + /** + * 登记机关 + */ + @ApiModelProperty("登记机关") + @JSONField(name = "登记机关") + @Excel(name = "登记机关") + private String djjg; + + /** + * 核准日期 + */ + @ApiModelProperty("核准日期") + @JSONField(name = "核准日期") + @Excel(name = "核准日期") + private String hzrq; + + /** + * 经营状态 + */ + @ApiModelProperty("经营状态") + @JSONField(name = "经营状态") + @Excel(name = "经营状态") + private String jyzt; + + /** + * 状态日期 + */ + @ApiModelProperty("状态日期") + @JSONField(name = "状态日期") + @Excel(name = "状态日期") + private String ztrq; + + /** + * 注销日期 + */ + @ApiModelProperty("注销日期") + @JSONField(name = "注销日期") + @Excel(name = "注销日期") + private String zxrq; + + /** + * 吊销日期 + */ + @ApiModelProperty("吊销日期") + @JSONField(name = "吊销日期") + @Excel(name = "吊销日期") + private String dxrq; + + /** + * 联系电话 + */ + @ApiModelProperty("联系电话") + @JSONField(name = "联系电话") + @Excel(name = "联系电话") + private String lxdh; + + /** + * 是否园区内 + */ + @ApiModelProperty("是否园区内") + @JSONField(name = "是否园区内") + @Excel(name = "是否园区内") + private String sfyqn; + + /** + * 操作标识 + */ + @ApiModelProperty("操作标识") + @JSONField(name = "操作标识") + @Excel(name = "操作标识") + private String dwOperation; + + /** + * 入库时间 + */ + @ApiModelProperty("入库时间") + @JSONField(name = "入库时间") + @Excel(name = "入库时间") + private String dwTimestamp; + + /** + * 代理键 + */ + @ApiModelProperty("代理键") + @JSONField(name = "代理键") + @Excel(name = "代理键") + private String dwAgencykey; + + /** + * 来源机构 + */ + @ApiModelProperty("来源机构") + @JSONField(name = "来源机构") + @Excel(name = "来源机构") + private String dwLyjg; + + /** + * 来源表名 + */ + @ApiModelProperty("来源表名") + @JSONField(name = "来源表名") + @Excel(name = "来源表名") + private String dwLyb; /** * 是否删除：0，未删除；1，已删除 @@ -192,4 +392,5 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity { private Long isDeleted; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java index 0b6f37d..8166aef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java @@ -1,8 +1,10 @@ package com.ruoyi.jjh.declaration.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,53 +15,22 @@ import java.util.List; * @date 2023-08-25 */ public interface BmsEnterpriseBasicInfoMapper extends BaseMapper { - /** - * 查询企业基础信息 - * - * @param id 企业基础信息主键 - * @return 企业基础信息 - */ - public BmsEnterpriseBasicInfo selectBmsEnterpriseBasicInfoById(Long id); - /** * 查询企业基础信息列表 * * @param bmsEnterpriseBasicInfo 企业基础信息 * @return 企业基础信息集合 */ - public List selectBmsEnterpriseBasicInfoList(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); + public Page page(Page page,@Param("req") BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); - /** - * 新增企业基础信息 - * - * @param bmsEnterpriseBasicInfo 企业基础信息 - * @return 结果 - */ - public int insertBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); /** - * 修改企业基础信息 - * + * 查询企业基础信息列表所有 + * * @param bmsEnterpriseBasicInfo 企业基础信息 - * @return 结果 - */ - public int updateBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); - - /** - * 删除企业基础信息 - * - * @param id 企业基础信息主键 - * @return 结果 - */ - public int deleteBmsEnterpriseBasicInfoById(Long id); - - /** - * 批量删除企业基础信息 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 + * @return 企业基础信息集合 */ - public int deleteBmsEnterpriseBasicInfoByIds(Long[] ids); + List page(@Param("req") BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); /** * 作业台查询企业信息 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java index 62962b2..8c5acff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java @@ -1,15 +1,28 @@ package com.ruoyi.jjh.declaration.regular; +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import cn.hutool.json.JSONArray; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.BmsTemplateInfo; import com.ruoyi.jjh.declaration.entity.BmsTemplateRecord; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService; import com.ruoyi.jjh.declaration.service.IBmsTemplateRecordService; +import com.ruoyi.jjh.ent.entity.JContacts; +import com.ruoyi.jjh.ent.service.JContactsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; import javax.annotation.Resource; import java.time.LocalDate; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; /** @@ -21,6 +34,13 @@ import java.util.List; @Configuration @EnableScheduling public class TimeChange { + + @Value("${enterpriseUrl}") + private String enterpriseUrl; + + @Value("${isTiming}") + private Boolean isTiming; + /** * 申报模板 */ @@ -33,6 +53,17 @@ public class TimeChange { @Resource private IBmsTemplateRecordService bmsTemplateRecordService; + /** + * 企业联系人 + */ + @Resource + private JContactsService jContactsService; + + /** + * 企业信息 + */ + @Autowired + private IBmsEnterpriseBasicInfoService bmsEnterpriseBasicInfoService; /** * 根据每天的日期修改模板的状态 @@ -52,23 +83,28 @@ public class TimeChange { } bmsTemplateInfoService.updateBatchById(list); } - public void getTime(BmsTemplateRecord items){ + + public void getTime(BmsTemplateRecord items) { LocalDate currentDate = LocalDate.now(); LocalDate startDate = LocalDate.of(items.getStartTime().getYear(), items.getStartTime().getMonth(), items.getStartTime().getDayOfMonth()); LocalDate endDate = LocalDate.of(items.getEndTime().getYear(), items.getEndTime().getMonth(), items.getEndTime().getDayOfMonth()); - if(currentDate.isBefore(startDate)){ + if (currentDate.isBefore(startDate)) { items.setStatus(0); } - if(currentDate.isAfter(endDate)){ + if (currentDate.isAfter(endDate)) { items.setStatus(1); } - if (currentDate.equals(startDate)||currentDate.equals(endDate)) { + if (currentDate.equals(startDate) || currentDate.equals(endDate)) { items.setStatus(2); } if (currentDate.isAfter(startDate) && currentDate.isBefore(endDate)) { items.setStatus(2); } } + + /** + * 根据每天的日期修改在线模板的状态 + */ @Scheduled(cron = "1 0 0 * * *") private void templateRecordChange() { List list = bmsTemplateRecordService.list(); @@ -77,4 +113,80 @@ public class TimeChange { } bmsTemplateRecordService.updateBatchById(list); } + + /** + * 定时更新法人库-法人基本信息（统一社会信用代码） + */ + @Scheduled(cron = "0 0 2 * * *") + public void changeEnterpriseInfo() { + if (isTiming) { + List list = bmsEnterpriseBasicInfoService.list(); + List allList = new ArrayList<>(); + for (BmsEnterpriseBasicInfo items : list) { + String contacts = enterpriseUrl + "/645383/frjbxxtyshxydm"; + HashMap headers = new HashMap<>();//存放请求头，可以存放多个请求头 + headers.put("Content-Type", "application/json;charset=utf-8"); + //请求体 + JSONObject jsonObject = new JSONObject();//存放参数 + jsonObject.set("tyshxydm", items.getTyshxydm()); + jsonObject.set("pageIndex", 0); + HttpResponse response = HttpRequest.post(contacts) + .addHeaders(headers) + .body(jsonObject.toString()) + .execute(); + if (response.getStatus() == 200) { + JSONObject jsonObj = JSONUtil.parseObj(response.body()); + if ("200".equals(jsonObj.get("code"))) { + JSONObject reqData = JSONUtil.parseObj(jsonObj.get("data")); + JSONArray arr = reqData.getJSONArray("data"); // 直接获取数组，无需再次解析 + int total = reqData.getInt("total"); // 只需解析一次total并转换为整数 + if (total > 0) { + // 直接转换第一个元素为BmsEnterpriseBasicInfo对象 + BmsEnterpriseBasicInfo res = JSONUtil.toBean(arr.getJSONObject(0).toString(), BmsEnterpriseBasicInfo.class); + res.setId(items.getId()); + res.setMultiple(total); + allList.add(res); + } + } + } + } + bmsEnterpriseBasicInfoService.updateBatchById(allList); + } + } + + /** + * 定时更新法人库-企业联络人员（统一社会信用代码） + */ + @Scheduled(cron = "0 0 3 * * *") + public void changeContacts() { + if (isTiming) { + List list = bmsEnterpriseBasicInfoService.list(); + for (BmsEnterpriseBasicInfo items : list) { + String contacts = enterpriseUrl + "/645383/qyllrytyshxydm"; + HashMap headers = new HashMap<>();//存放请求头，可以存放多个请求头 + headers.put("Content-Type", "application/json;charset=utf-8"); + //请求体 + JSONObject jsonObject = new JSONObject();//存放参数 + jsonObject.set("tyshxydm", items.getTyshxydm()); + jsonObject.set("pageIndex", 0); + HttpResponse response = HttpRequest.post(contacts) + .addHeaders(headers) + .body(jsonObject.toString()) + .execute(); + if (response.getStatus() == 200) { + JSONObject jsonObj = JSONUtil.parseObj(response.body()); + if ("200".equals(jsonObj.get("code"))) { + JSONObject reqData = JSONUtil.parseObj(jsonObj.get("data")); + JSONArray arr = JSONUtil.parseArray(reqData.get("data")); + List allList = new ArrayList<>(); + for (Object o : arr) { + JContacts res = JSONUtil.toBean(o.toString(), JContacts.class); + allList.add(res); + } + jContactsService.saveOrUpdateBatch(allList); + } + } + } + } + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseBasicInfoService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseBasicInfoService.java index 6d88109..318e17f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseBasicInfoService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseBasicInfoService.java @@ -1,5 +1,6 @@ package com.ruoyi.jjh.declaration.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest; @@ -13,13 +14,7 @@ import java.util.List; * @date 2023-08-25 */ public interface IBmsEnterpriseBasicInfoService extends IService { - /** - * 查询企业基础信息 - * - * @param id 企业基础信息主键 - * @return 企业基础信息 - */ - public BmsEnterpriseBasicInfo selectBmsEnterpriseBasicInfoById(Long id); + /** * 查询企业基础信息列表 @@ -27,39 +22,16 @@ public interface IBmsEnterpriseBasicInfoService extends IService selectBmsEnterpriseBasicInfoList(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); - - /** - * 新增企业基础信息 - * - * @param bmsEnterpriseBasicInfo 企业基础信息 - * @return 结果 - */ - public int insertBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); + Page page(Page page, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); /** - * 修改企业基础信息 - * + * 查询企业基础信息列表所有 + * * @param bmsEnterpriseBasicInfo 企业基础信息 - * @return 结果 - */ - public int updateBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); - - /** - * 批量删除企业基础信息 - * - * @param ids 需要删除的企业基础信息主键集合 - * @return 结果 + * @return 企业基础信息集合 */ - public int deleteBmsEnterpriseBasicInfoByIds(Long[] ids); + List page( BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo); - /** - * 删除企业基础信息信息 - * - * @param id 企业基础信息主键 - * @return 结果 - */ - public int deleteBmsEnterpriseBasicInfoById(Long id); List workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest); /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java index 5348512..010911e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsBigStrongAwardServiceImpl.java @@ -138,7 +138,7 @@ public class BmsBigStrongAwardServiceImpl extends ServiceImpl 申报记录 --> // 查询企业数据 List enterpriseInfoList = iBmsEnterpriseBasicInfoService.lambdaQuery().list(); - Map enterpriseBasicMap = enterpriseInfoList.stream().collect(Collectors.toMap(BmsEnterpriseBasicInfo::getCreditCode, Function.identity())); + Map enterpriseBasicMap = enterpriseInfoList.stream().collect(Collectors.toMap(BmsEnterpriseBasicInfo::getTyshxydm, Function.identity())); // 匹配企业 List enterpriseIdList = new ArrayList<>(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsEnterpriseBasicInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsEnterpriseBasicInfoServiceImpl.java index 171fd9f..bef75c2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsEnterpriseBasicInfoServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsEnterpriseBasicInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.jjh.declaration.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; @@ -19,16 +20,6 @@ import java.util.List; @Service public class BmsEnterpriseBasicInfoServiceImpl extends ServiceImpl implements IBmsEnterpriseBasicInfoService { - /** - * 查询企业基础信息 - * - * @param id 企业基础信息主键 - * @return 企业基础信息 - */ - @Override - public BmsEnterpriseBasicInfo selectBmsEnterpriseBasicInfoById(Long id) { - return baseMapper.selectBmsEnterpriseBasicInfoById(id); - } /** * 查询企业基础信息列表 @@ -37,55 +28,21 @@ public class BmsEnterpriseBasicInfoServiceImpl extends ServiceImpl selectBmsEnterpriseBasicInfoList(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { - return baseMapper.selectBmsEnterpriseBasicInfoList(bmsEnterpriseBasicInfo); - } - - /** - * 新增企业基础信息 - * - * @param bmsEnterpriseBasicInfo 企业基础信息 - * @return 结果 - */ - @Override - public int insertBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { - bmsEnterpriseBasicInfo.setCreateTime(DateUtils.getNowDate()); - return baseMapper.insertBmsEnterpriseBasicInfo(bmsEnterpriseBasicInfo); + public Page page(Page page, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { + return baseMapper.page(page,bmsEnterpriseBasicInfo); } /** - * 修改企业基础信息 - * + * 查询企业基础信息列表所有 + * * @param bmsEnterpriseBasicInfo 企业基础信息 - * @return 结果 - */ - @Override - public int updateBmsEnterpriseBasicInfo(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { - bmsEnterpriseBasicInfo.setUpdateTime(DateUtils.getNowDate()); - return baseMapper.updateBmsEnterpriseBasicInfo(bmsEnterpriseBasicInfo); - } - - /** - * 批量删除企业基础信息 - * - * @param ids 需要删除的企业基础信息主键 - * @return 结果 + * @return 企业基础信息 */ @Override - public int deleteBmsEnterpriseBasicInfoByIds(Long[] ids) { - return baseMapper.deleteBmsEnterpriseBasicInfoByIds(ids); + public List page(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) { + return baseMapper.page(bmsEnterpriseBasicInfo); } - /** - * 删除企业基础信息信息 - * - * @param id 企业基础信息主键 - * @return 结果 - */ - @Override - public int deleteBmsEnterpriseBasicInfoById(Long id) { - return baseMapper.deleteBmsEnterpriseBasicInfoById(id); - } @Override public List workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java index 68cd95d..b9874ee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsIndustrialInternetAwardServiceImpl.java @@ -116,7 +116,7 @@ public class BmsIndustrialInternetAwardServiceImpl extends ServiceImpl selectBmsTemplateNameList(BmsTemplateQueryDto bmsTemplateQueryDto) { Long enterpriseId = bmsTemplateQueryDto.getEnterpriseId(); - BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo = iBmsEnterpriseBasicInfoService.selectBmsEnterpriseBasicInfoById(enterpriseId); + BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo = iBmsEnterpriseBasicInfoService.getById(enterpriseId); if (BeanUtil.isNotEmpty(bmsEnterpriseBasicInfo)) { - bmsTemplateQueryDto.setCreditCode(bmsEnterpriseBasicInfo.getCreditCode()); + bmsTemplateQueryDto.setCreditCode(bmsEnterpriseBasicInfo.getTyshxydm()); return baseMapper.selectBmsTemplateNameList(bmsTemplateQueryDto); } return null; @@ -149,10 +149,10 @@ public class BmsTemplateRecordServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(BmsEnterpriseBasicInfo::getCreditCode, codeList); + lambdaQueryWrapper.in(BmsEnterpriseBasicInfo::getTyshxydm, codeList); return iBmsEnterpriseBasicInfoService.list(lambdaQueryWrapper); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java index 5508d60..44dbb62 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/CommonServiceImpl.java @@ -110,7 +110,7 @@ public class CommonServiceImpl implements ICommonService { @Transactional(rollbackFor = Exception.class) public Long checkEnterprise(String creditCode, int templateRecordId) { Long enterpriseId = 0L; - BmsEnterpriseBasicInfo basicInfo = bmsEnterpriseBasicInfoService.getOne(Wrappers.lambdaQuery(BmsEnterpriseBasicInfo.class).eq(BmsEnterpriseBasicInfo::getCreditCode, creditCode)); + BmsEnterpriseBasicInfo basicInfo = bmsEnterpriseBasicInfoService.getOne(Wrappers.lambdaQuery(BmsEnterpriseBasicInfo.class).eq(BmsEnterpriseBasicInfo::getTyshxydm, creditCode)); if (BeanUtil.isEmpty(basicInfo)) { throw new ServiceException("申请企业未入企业库！"); } @@ -126,7 +126,7 @@ public class CommonServiceImpl implements ICommonService { @Transactional(rollbackFor = Exception.class) public void checkDeclaration(String creditCode, int templateRecordId) { // check当前企业是否已经申请 - BmsEnterpriseBasicInfo enterpriseInfo = bmsEnterpriseBasicInfoService.getOne(Wrappers.lambdaQuery(BmsEnterpriseBasicInfo.class).eq(BmsEnterpriseBasicInfo::getCreditCode, creditCode)); + BmsEnterpriseBasicInfo enterpriseInfo = bmsEnterpriseBasicInfoService.getOne(Wrappers.lambdaQuery(BmsEnterpriseBasicInfo.class).eq(BmsEnterpriseBasicInfo::getTyshxydm, creditCode)); // check 申请是否过期或者该申请是不限时的 BmsTemplateRecord templateRecord = iBmsTemplateRecordService.getById(templateRecordId); if (templateRecord.getStatus() == 0) { @@ -165,7 +165,7 @@ public class CommonServiceImpl implements ICommonService { if (BeanUtil.isEmpty(basicInfo)) { throw new ServiceException("申请企业未入企业库！"); } - BmsEnterpriseDirectory enterpriseDirectory = bmsEnterpriseDirectoryService.getOne(Wrappers.lambdaQuery(BmsEnterpriseDirectory.class).eq(BmsEnterpriseDirectory::getCreditCode, basicInfo.getCreditCode()).eq(BmsEnterpriseDirectory::getTemplateRecordId, templateId)); + BmsEnterpriseDirectory enterpriseDirectory = bmsEnterpriseDirectoryService.getOne(Wrappers.lambdaQuery(BmsEnterpriseDirectory.class).eq(BmsEnterpriseDirectory::getCreditCode, basicInfo.getTyshxydm()).eq(BmsEnterpriseDirectory::getTemplateRecordId, templateId)); if (BeanUtil.isEmpty(enterpriseDirectory)) { throw new ServiceException("申请企业不在企业名录中！"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/OpenInterfaceServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/OpenInterfaceServiceImpl.java index e89c8ec..8f97ffe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/OpenInterfaceServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/OpenInterfaceServiceImpl.java @@ -58,13 +58,13 @@ public class OpenInterfaceServiceImpl implements IOpenInterfaceService { EnterpriseInfoTemplateVo enterpriseInfoTemplateVo = new EnterpriseInfoTemplateVo(); // 获取企业信息 List enterpriseList = iBmsEnterpriseBasicInfoService.lambdaQuery() - .like(BmsEnterpriseBasicInfo::getCreditCode, creditCode).list(); + .like(BmsEnterpriseBasicInfo::getTyshxydm, creditCode).list(); List directoryList = new ArrayList<>(); List templateRecordList = new ArrayList<>(); if (CollectionUtil.isNotEmpty(enterpriseList)) { // 企业信息不为空，获取企业名录信息 enterpriseInfoTemplateVo.setEnterpriseBasicList(enterpriseList); - List creditCodeList = enterpriseList.stream().map(BmsEnterpriseBasicInfo::getCreditCode).collect(Collectors.toList()); + List creditCodeList = enterpriseList.stream().map(BmsEnterpriseBasicInfo::getTyshxydm).collect(Collectors.toList()); // 企业名录列表 directoryList = iBmsEnterpriseDirectoryService.lambdaQuery().in(BmsEnterpriseDirectory::getCreditCode, creditCodeList).list(); System.out.println(directoryList); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JContactsController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JContactsController.java index a9157bb..fe97a92 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JContactsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JContactsController.java @@ -3,14 +3,13 @@ package com.ruoyi.jjh.ent.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.jjh.ent.entity.JContacts; -import com.ruoyi.jjh.ent.entity.JEnterpriseContact; -import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; +import com.ruoyi.jjh.ent.entity.request.JContactsRequest; import com.ruoyi.jjh.ent.service.JContactsService; -import com.ruoyi.jjh.ent.service.JEnterpriseContactService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -19,6 +18,7 @@ import java.util.Arrays; /** * 企业联系人信息(存在多个)（j_contacts）表控制层 + * * @author du * @since 2024/5/13 9:56 */ @@ -31,18 +31,29 @@ public class JContactsController extends BaseController { private JContactsService jContactsService; /** - * 分页查询所有数据 + * 分页查询联络人数据 * * @param jContacts 查询实体 * @return 所有数据 */ - @ApiOperation(value = "分页查询所有数据", response = JContacts.class) + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')") + @ApiOperation(value = "分页查询联络人数据", response = JContacts.class) @GetMapping - public AjaxResult selectAll( JContacts jContacts) { - if(jContacts.getCreditCode()==null || jContacts.getCreditCode().isEmpty()){ - throw new ServiceException("该企业的信用代码不可为空"); + public AjaxResult selectAll( JContactsRequest jContacts) { + // 获取当前登录用户是否是企业端 + boolean admin = false; + boolean b = false; + String str = null; + try { + admin = SecurityUtils.isAdmin(SecurityUtils.getUserId()); + b = SecurityUtils.hasRole("ent"); + str = SecurityUtils.getUsername(); + } catch (Exception ignored) { } - return success(jContactsService.page(jContacts)); + if (!admin && b) { + jContacts.setTyshxydm(str); + } + return success(jContactsService.page( jContacts)); } @@ -52,45 +63,12 @@ public class JContactsController extends BaseController { * @param id 主键 * @return 单条数据 */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')") @ApiOperation(value = "通过主键查询单条数据", response = JContacts.class) @GetMapping("{id}") public AjaxResult selectOne(@PathVariable Serializable id) { return success(jContactsService.getById(id)); } - /** - * 新增数据 - * - * @param jContacts 实体对象 - * @return 新增结果 - */ - @ApiOperation(value = "新增数据") - @PostMapping - public AjaxResult insert(@RequestBody JContacts jContacts) { - return success(jContactsService.save(jContacts)); - } - - /** - * 修改数据 - * - * @param jContacts 实体对象 - * @return 修改结果 - */ - @ApiOperation(value = "修改数据") - @PutMapping - public AjaxResult update(@RequestBody JContacts jContacts) { - return success(jContactsService.updateById(jContacts)); - } - /** - * 删除数据 - * - * @param id 主键结合 - * @return 删除结果 - */ - @ApiOperation(value = "删除数据") - @DeleteMapping - public AjaxResult delete(@RequestParam("id") Long[] id) { - return success(jContactsService.removeByIds(Arrays.asList(id))); - } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java index c8c5fab..86b495b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JEnterpriseContactController.java @@ -3,11 +3,14 @@ package com.ruoyi.jjh.ent.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.jjh.ent.entity.JEnterpriseContact; import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; import com.ruoyi.jjh.ent.service.JEnterpriseContactService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -34,9 +37,24 @@ public class JEnterpriseContactController extends BaseController { * @param jEnterpriseContactRequest 查询实体 * @return 所有数据 */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')") @ApiOperation(value = "分页查询所有数据", response = JEnterpriseContact.class) @GetMapping public AjaxResult selectAll(Page page, JEnterpriseContactRequest jEnterpriseContactRequest) { + // 获取当前登录用户是否是企业端 + boolean admin = false; + boolean b = false; + SysUser str = null; + try { + admin = SecurityUtils.isAdmin(SecurityUtils.getUserId()); + b = SecurityUtils.hasRole("ent"); + str =SecurityUtils.getLoginUser().getUser(); + } catch (Exception ignored) { + } + if(!admin && b){ + jEnterpriseContactRequest.setEnterpriseName(str.getNickName()); + jEnterpriseContactRequest.setEnterpriseCode(str.getUserName()); + } return success(jEnterpriseContactService.page(page, jEnterpriseContactRequest)); } @@ -47,6 +65,7 @@ public class JEnterpriseContactController extends BaseController { * @param id 主键 * @return 单条数据 */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')") @ApiOperation(value = "通过主键查询单条数据", response = JEnterpriseContact.class) @GetMapping("{id}") public AjaxResult selectOne(@PathVariable Serializable id) { @@ -59,6 +78,7 @@ public class JEnterpriseContactController extends BaseController { * @param jEnterpriseContact 实体对象 * @return 新增结果 */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')") @ApiOperation(value = "新增数据") @PostMapping public AjaxResult insert(@RequestBody JEnterpriseContact jEnterpriseContact) { @@ -71,6 +91,7 @@ public class JEnterpriseContactController extends BaseController { * @param jEnterpriseContact 实体对象 * @return 修改结果 */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')") @ApiOperation(value = "修改数据") @PutMapping public AjaxResult update(@RequestBody JEnterpriseContact jEnterpriseContact) { @@ -83,6 +104,7 @@ public class JEnterpriseContactController extends BaseController { * @param id 主键结合 * @return 删除结果 */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,ent')") @ApiOperation(value = "删除数据") @DeleteMapping public AjaxResult delete(@RequestParam("id") Long[] id) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java index 8f65768..c14cf5e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java @@ -9,6 +9,7 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; +import com.ruoyi.jjh.declaration.regular.TimeChange; import com.ruoyi.jjh.ent.entity.JMemorandum; import com.ruoyi.jjh.ent.entity.request.JMemorandumRequest; import com.ruoyi.jjh.ent.service.JMemorandumService; @@ -46,6 +47,9 @@ public class JMemorandumController extends BaseController { @Resource private JMemorandumService jMemorandumService; + @Resource + private TimeChange ts; + /** * 分页查询所有数据 * @@ -59,6 +63,23 @@ public class JMemorandumController extends BaseController { return success(jMemorandumService.page(page, jMemorandumRequest)); } + @ApiOperation(value = "定时更新法人库-法人基本信息（统一社会信用代码）") + @GetMapping("/getEnterpriseInfo") + public AjaxResult selectAll2() { + ts.changeEnterpriseInfo(); + return success(); + } + + @ApiOperation(value = "定时更新法人库-企业联络人员（统一社会信用代码）") + @GetMapping("/getChangeContacts") + public AjaxResult selectAll1() { + ts.changeContacts(); + return AjaxResult.success(); + } + + + + /** * 根据关联项目库ID或者企业库ID查询该ID下的备忘录 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java index 117e1de..dfd20c3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ProjectExcelUtil; import com.ruoyi.common.utils.poi.ProjectValueUtil; @@ -16,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -40,6 +42,27 @@ public class JProjectController extends BaseController { @Resource private JProjectService jProjectService; +// /** +// * 改变没有信用代码的项目 +// * @return +// */ +// @ApiOperation(value = "改变没有信用代码的项目", response = JProject.class) +// @GetMapping("/changeTyshxydm") +// public AjaxResult changeTyshxydm() { +// return success(jProjectService.changeTyshxydm()); +// } + +// /** +// * 改变项目中的英文括号 +// * +// * @return +// */ +// @ApiOperation(value = "改变项目中的英文括号", response = JProject.class) +// @GetMapping("/changeKh") +// public AjaxResult changeKh() { +// return success(jProjectService.changeKh()); +// } + /** * 分页查询项目 * @@ -50,6 +73,19 @@ public class JProjectController extends BaseController { @ApiOperation(value = "分页查询项目", response = JProject.class) @GetMapping public AjaxResult selectPage(Page page, JProject jProject) { + // 获取当前登录用户是否是企业端 + boolean b = false; + boolean admin = false; + String str = null; + try { + admin = SecurityUtils.isAdmin(SecurityUtils.getUserId()); + b = SecurityUtils.hasRole("ent"); + str = SecurityUtils.getUsername(); + } catch (Exception ignored) { + } + if (!admin && b) { + jProject.setCreditCode(str); + } return success(jProjectService.page(page, jProject)); } @@ -59,6 +95,7 @@ public class JProjectController extends BaseController { * @param name 数据 * @return 所有数据 */ + @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") @ApiOperation(value = "作业台查询所有项目(政务端)", response = JProject.class) @GetMapping("/selectAll") public AjaxResult selectAll(@RequestParam String name) { @@ -97,6 +134,7 @@ public class JProjectController extends BaseController { * @param jProject 实体对象 * @return 新增结果 */ + @PreAuthorize("@ss.hasAnyRoles('admin')") @ApiOperation(value = "新增项目") @PostMapping public AjaxResult insert(@RequestBody JProject jProject) { @@ -130,6 +168,7 @@ public class JProjectController extends BaseController { /** * 导入已有的excel项目数据 */ + @PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')") @ApiOperation(value = "导入已有的excel项目数据") @PostMapping(value = "/export", consumes = "multipart/form-data") public AjaxResult export(@RequestPart("file") MultipartFile file) throws Exception { @@ -148,6 +187,7 @@ public class JProjectController extends BaseController { /** * 导入下载的excel模板和参数项目数据 */ + @PreAuthorize("@ss.hasAnyRoles('admin,gov,other-gov')") @ApiOperation(value = "导入下载的excel模板和参数项目数据") @ApiImplicitParams({ @ApiImplicitParam(name = "projectClassify", value = "项目分类", required = true), diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java new file mode 100644 index 0000000..80da243 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JSmartRemindersController.java @@ -0,0 +1,100 @@ +package com.ruoyi.jjh.ent.controller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.jjh.ent.entity.JEnterpriseContact; +import com.ruoyi.jjh.ent.entity.JSmartReminders; +import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; +import com.ruoyi.jjh.ent.service.JSmartRemindersService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.Arrays; + +/** + * 智能提醒（j_smart_reminders）表控制层 + * @author du + * @since 2024/7/1 13:33 + */ +@RestController +@RequestMapping("/jjh/jSmartReminders") +@Api(tags = "智能提醒") +public class JSmartRemindersController extends BaseController { + + @Resource + private JSmartRemindersService jSmartRemindersService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param jSmartReminders 查询实体 + * @return 所有数据 + */ +// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "分页查询所有数据", response = JSmartReminders.class) + @GetMapping + public AjaxResult selectAll(Page page, JSmartReminders jSmartReminders) { + return success(jSmartRemindersService.page(page, jSmartReminders)); + } + + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ +// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "通过主键查询单条数据", response = JSmartReminders.class) + @GetMapping("{id}") + public AjaxResult selectOne(@PathVariable Serializable id) { + return success(jSmartRemindersService.getById(id)); + } + + /** + * 新增数据 + * + * @param jSmartReminders 实体对象 + * @return 新增结果 + */ +// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "新增数据") + @PostMapping + public AjaxResult insert(@RequestBody JSmartReminders jSmartReminders) { + return success(jSmartRemindersService.add(jSmartReminders)); + } + + /** + * 修改数据 + * + * @param jSmartReminders 实体对象 + * @return 修改结果 + */ +// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "修改数据") + @PutMapping + public AjaxResult update(@RequestBody JSmartReminders jSmartReminders) { + return success(jSmartRemindersService.updateById(jSmartReminders)); + } + + /** + * 删除数据 + * + * @param id 主键结合 + * @return 删除结果 + */ +// @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov')") + @ApiOperation(value = "删除数据") + @DeleteMapping + public AjaxResult delete(@RequestParam("id") Long id) { + return success(jSmartRemindersService.removeById(id)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JContacts.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JContacts.java index fce1670..32a33db 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JContacts.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JContacts.java @@ -19,59 +19,149 @@ import lombok.Data; public class JContacts extends BaseInfoEntity { /** - * Id + * 代理键 */ - @TableId(value = "id", type = IdType.AUTO) - @ApiModelProperty("Id") - private Long id; + @TableId + @ApiModelProperty("代理键") + private String dwAgencykey; /** - * 联系人姓名 + * 创建id */ - @Excel(name = "联系人姓名") - @ApiModelProperty("联系人姓名") - private String contactName; + @JSONField(serialize=false) + @TableField(fill = FieldFill.INSERT) + private Long createId; /** - * 公司职务 + * 更新id */ - @Excel(name = "公司职务") - @ApiModelProperty("公司职务") - private String firmOffice; + @JSONField(serialize=false) + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updateId; /** - * 企业统一社会信用代码 + * 企业名称 */ - @Excel(name = "企业统一社会信用代码") - @ApiModelProperty("企业统一社会信用代码") - private String creditCode; + @Excel(name = "企业名称") + @ApiModelProperty("企业名称") + private String qymc; /** - * 手机号 + * 标识证号 */ - @Excel(name = "手机号") - @ApiModelProperty("手机号") - private String phone; + @Excel(name = "标识证号") + @ApiModelProperty("标识证号") + private String bszh; /** - * 邮箱 + * 统一社会信用代码 */ - @Excel(name = "邮箱") - @ApiModelProperty("邮箱") - private String email; + @Excel(name = "统一社会信用代码") + @ApiModelProperty("统一社会信用代码") + private String tyshxydm; + /** + * 组织机构代码 + */ + @Excel(name = "组织机构代码") + @ApiModelProperty("组织机构代码") + private String zzjgdm; /** - * 创建id + * 联络人姓名 */ - @JSONField(serialize=false) - @TableField(fill = FieldFill.INSERT) - private Long createId; + @Excel(name = "联络人姓名") + @ApiModelProperty("联络人姓名") + private String llrxm; /** - * 更新id + * 联络人职务 */ - @JSONField(serialize=false) - @TableField(fill = FieldFill.UPDATE) - private Long updateId; + @Excel(name = "联络人职务") + @ApiModelProperty("联络人职务") + private String llrzw; + + /** + * 电子邮箱 + */ + @Excel(name = "电子邮箱") + @ApiModelProperty("电子邮箱") + private String dzyx; + + + /** + * 移动电话 + */ + @Excel(name = "移动电话") + @ApiModelProperty("移动电话") + private String yddh; + + /** + * 固定电话 + */ + @Excel(name = "固定电话") + @ApiModelProperty("固定电话") + private String gddh; + + /** + * 联络人编号 + */ + @Excel(name = "联络人编号") + @ApiModelProperty("联络人编号") + private String llrbh; + + /** + * 默认法人统一社会用代码 + */ + @Excel(name = "默认法人统一社会用代码") + @ApiModelProperty("默认法人统一社会用代码") + private String dwExtend1; + + /** + * 法人注册号 + */ + @Excel(name = "法人注册号") + @ApiModelProperty("法人注册号") + private String dwExtend2; + + /** + * 法人组织机构代码 + */ + @Excel(name = "法人组织机构代码") + @ApiModelProperty("法人组织机构代码") + private String dwExtend3; + + + /** + * 操作标识 + */ + @Excel(name = "操作标识") + @ApiModelProperty("操作标识") + private String dwOperation; + + + /** + * 入库时间 + */ + @Excel(name = "入库时间") + @ApiModelProperty("入库时间") + private String dwTimestamp; + + + + + /** + * 来源机构 + */ + @Excel(name = "来源机构") + @ApiModelProperty("来源机构") + private String dwLyjg; + + /** + * 来源表名 + */ + @Excel(name = "来源表名") + @ApiModelProperty("来源表名") + private String dwLyb; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JSmartReminders.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JSmartReminders.java new file mode 100644 index 0000000..abf6838 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JSmartReminders.java @@ -0,0 +1,91 @@ +package com.ruoyi.jjh.ent.entity; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.jjh.common.entity.BaseInfoEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; + +/** + * 智能提醒（j_smart_reminders）表实体类 + * @author du + * @since 2024/7/1 13:33 + */ +@Data +@ApiModel("智能提醒") +@TableName(value = "j_smart_reminders") +public class JSmartReminders extends BaseInfoEntity { + + /** + * Id + */ + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty("Id") + private Long id; + + /** + * 规则名称 + */ + @NotNull + @ApiModelProperty("规则名称") + private String rulesName; + + /** + * 提醒对象 1.企业用户 2政务用户 + */ + @NotNull + @ApiModelProperty("提醒对象 1.企业用户 2政务用户") + private Integer alertRecipients; + + /** + * 提醒方式 1.定时提醒 2.不定时提醒 + */ + @NotNull + @ApiModelProperty("提醒方式 1.定期提醒 2.不定期提醒") + private Integer alertManner; + + /** + * 提醒时间 + */ + @ApiModelProperty("提醒时间") + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime alertTime; + + /** + * 提醒分类 1.申报任务即将结束(企业) 2项目即将建设完成(政务) + */ + @ApiModelProperty("提醒分类 1.申报任务即将结束(企业) 2项目即将建设完成(政务)") + private Integer alertType; + + /** + * 提前天数提醒 + */ + @ApiModelProperty("提前天数提醒") + private Integer daysAdvance; + + /** + * 提醒内容 + */ + @ApiModelProperty("提醒内容") + private String alertContent; + + /** + * 创建ID + */ + @ApiModelProperty("创建ID") + @TableField(fill = FieldFill.INSERT) + private Long createId; + + /** + * 更新者ID + */ + @ApiModelProperty("更新者ID") + @TableField(fill = FieldFill.UPDATE) + private Long updateId; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JContactsRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JContactsRequest.java new file mode 100644 index 0000000..5e67c69 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/request/JContactsRequest.java @@ -0,0 +1,23 @@ +package com.ruoyi.jjh.ent.entity.request; + +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * 分页查询法人库-企业联络人员（统一社会信用代码） + * @author du + * @since 2024/6/28 11:18 + */ +@Data +public class JContactsRequest { + + /** + * 统一社会信用代码 + */ + @NotNull + @ApiModelProperty("统一社会信用代码") + private String tyshxydm; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JContactsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JContactsMapper.java index da455bf..08d6374 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JContactsMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JContactsMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.jjh.ent.entity.JContacts; import com.ruoyi.jjh.ent.entity.JEnterpriseContact; +import com.ruoyi.jjh.ent.entity.request.JContactsRequest; import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; import org.apache.ibatis.annotations.Param; @@ -16,5 +17,5 @@ import java.util.List; */ public interface JContactsMapper extends BaseMapper { - List page(@Param("req") JContacts jContacts); + List page( @Param("req") JContactsRequest jContacts); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JSmartRemindersMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JSmartRemindersMapper.java new file mode 100644 index 0000000..d269760 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/mapper/JSmartRemindersMapper.java @@ -0,0 +1,25 @@ +package com.ruoyi.jjh.ent.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.jjh.ent.entity.JSmartReminders; +import org.apache.ibatis.annotations.Param; + +/** + * 智能提醒（j_smart_reminders）表数据访问层 + * + * @author makejava + * @since 2024-03-25 11:49:34 + */ +public interface JSmartRemindersMapper extends BaseMapper { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param jSmartReminders 查询实体 + * @return 所有数据 + */ + Page page(Page page, @Param("req") JSmartReminders jSmartReminders); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JContactsService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JContactsService.java index 7d25af7..6552661 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JContactsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JContactsService.java @@ -3,8 +3,7 @@ package com.ruoyi.jjh.ent.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.jjh.ent.entity.JContacts; -import com.ruoyi.jjh.ent.entity.JEnterpriseContact; -import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; +import com.ruoyi.jjh.ent.entity.request.JContactsRequest; import java.util.List; @@ -21,5 +20,5 @@ public interface JContactsService extends IService { * @param jContacts 查询实体 * @return 所有数据 */ - List page( JContacts jContacts); + List page( JContactsRequest jContacts); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java index fece050..e6fb573 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JProjectService.java @@ -58,5 +58,18 @@ public interface JProjectService extends IService { List selectAl1l(); + + /** + * 改变没有信用代码的项目 + * @return + */ + String changeTyshxydm(); + + /** + * 改变项目中的英文括号 + * + * @return + */ + String changeKh(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JSmartRemindersService.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JSmartRemindersService.java new file mode 100644 index 0000000..996b1b8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/JSmartRemindersService.java @@ -0,0 +1,31 @@ +package com.ruoyi.jjh.ent.service; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.jjh.ent.entity.JSmartReminders; + + +/** + * 智能提醒（j_smart_reminders）表业务层 + * @author du + * @since 2024/7/1 13:33 + */ +public interface JSmartRemindersService extends IService { + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param jSmartReminders 查询实体 + * @return 所有数据 + */ + Page page(Page page, JSmartReminders jSmartReminders); + + /** + * 新增数据 + * + * @param jSmartReminders 实体对象 + * @return 新增结果 + */ + int add(JSmartReminders jSmartReminders); +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JContactsImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JContactsImpl.java index 58c5890..6d7979f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JContactsImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JContactsImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.jjh.ent.entity.JContacts; import com.ruoyi.jjh.ent.entity.JEnterpriseContact; +import com.ruoyi.jjh.ent.entity.request.JContactsRequest; import com.ruoyi.jjh.ent.entity.request.JEnterpriseContactRequest; import com.ruoyi.jjh.ent.mapper.JContactsMapper; import com.ruoyi.jjh.ent.mapper.JEnterpriseContactMapper; @@ -28,7 +29,7 @@ public class JContactsImpl extends ServiceImpl imple * @return 所有数据 */ @Override - public List page( JContacts jContacts) { + public List page( JContactsRequest jContacts) { return baseMapper.page(jContacts); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java index 0754cb1..cc8c224 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JProjectServiceImpl.java @@ -2,11 +2,14 @@ package com.ruoyi.jjh.ent.service.impl; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo; import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; import com.ruoyi.jjh.declaration.entity.vo.BmsApprovalInfoQueryVo; import com.ruoyi.jjh.declaration.service.IBmsDeclarationRecordsService; +import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService; import com.ruoyi.jjh.declaration.service.IBmsTemplateInfoService; import com.ruoyi.jjh.ent.entity.JProject; import com.ruoyi.jjh.ent.mapper.JProjectMapper; @@ -15,6 +18,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -33,6 +37,9 @@ public class JProjectServiceImpl extends ServiceImpl i @Resource private IBmsTemplateInfoService iBmsTemplateInfoService; + + @Resource + private IBmsEnterpriseBasicInfoService iBmsEnterpriseBasicInfoService; /** * 分页查询所有数据 * @@ -127,6 +134,49 @@ public class JProjectServiceImpl extends ServiceImpl i return lists; } + /** + * 改变没有信用代码的项目 + * @return + */ + @Override + public String changeTyshxydm() { + List listE = iBmsEnterpriseBasicInfoService.list(); + //获取项目库信用代码为空的企业 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.isNull("credit_code"); + List listJ= this.list(queryWrapper); + listJ.forEach(x->{ + listE.forEach(y->{ + if (x.getDeclareUnit().equals(y.getQymc())){ + JProject jp = new JProject(); + jp.setId(x.getId()); + jp.setCreditCode(y.getTyshxydm()); + this.updateById(jp); + } + }); + }); + return ""; + } + /** + * 改变项目中的英文括号 + * + * @return + */ + @Override + public String changeKh() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like("declare_unit", "("); + List listJ= this.list(queryWrapper); + listJ.forEach(x->{ + String declareUnit = x.getDeclareUnit(); + // 将英文括号替换为中文括号 + String result = declareUnit.replaceAll("\\(", "（") + .replaceAll("\\)", "）"); + x.setDeclareUnit(result); + this.updateById(x); + }); + return ""; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartRemindersServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartRemindersServiceImpl.java new file mode 100644 index 0000000..675fab8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/JSmartRemindersServiceImpl.java @@ -0,0 +1,59 @@ +package com.ruoyi.jjh.ent.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.jjh.declaration.entity.BmsFundingDetail; +import com.ruoyi.jjh.ent.entity.JSmartReminders; +import com.ruoyi.jjh.ent.mapper.JSmartRemindersMapper; +import com.ruoyi.jjh.ent.service.JSmartRemindersService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 智能提醒（j_smart_reminders）表业务实现层 + * + * @author du + * @since 2024/7/1 13:33 + */ +@Service +public class JSmartRemindersServiceImpl extends ServiceImpl implements JSmartRemindersService { + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param jSmartReminders 查询实体 + * @return 所有数据 + */ + @Override + public Page page(Page page, JSmartReminders jSmartReminders) { + return baseMapper.page(page, jSmartReminders); + } + + /** + * 新增数据 + * + * @param jSmartReminders 实体对象 + * @return 新增结果 + */ + @Override + public int add(JSmartReminders jSmartReminders) { + if (jSmartReminders.getAlertManner() == 2) { + List list = lambdaQuery().eq(JSmartReminders::getAlertManner, 2).list(); + if (list.size() >= 2) { + throw new ServiceException("已有不定期提醒,不可新增!"); + } + if ((jSmartReminders.getAlertRecipients() == 1 && jSmartReminders.getAlertType() == 1) + || (jSmartReminders.getAlertRecipients() == 2 && jSmartReminders.getAlertType() == 2)) { + save(jSmartReminders); + } else { + throw new ServiceException("参数请求错误"); + } + } + return 0; + } +} + diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index a366bbc..4297e45 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -63,3 +63,5 @@ spring: multi-statement-allow: true #自己客户端地址 returnUrl: http://39.101.188.84:9999/demo/JinJiHu +#定时任务更新企业信息和联系人的开启 +isTiming: false \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application-internet.yml b/ruoyi-admin/src/main/resources/application-internet.yml index 19a2e73..b65c0dd 100644 --- a/ruoyi-admin/src/main/resources/application-internet.yml +++ b/ruoyi-admin/src/main/resources/application-internet.yml @@ -111,4 +111,5 @@ spring: max-wait: -1ms #自己客户端地址 returnUrl: https://idp.sipac.gov.cn/bms -#returnUrl: http://192.168.0.105:80/ \ No newline at end of file +#定时任务更新企业信息和联系人的开启 +isTiming: true \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 1376adf..23abee1 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -16,7 +16,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 9040 + port: 9041 servlet: # 应用的访问路径 context-path: / @@ -142,6 +142,8 @@ clientSecret: Q5ym8T9XIEZAn+DSQl+aXA== getInfoId: https://qyt.sipac.gov.cn/enterprise-gateway/sipsg-enterprise/sys/third/userInfo #政务端政务通获取用户信息接口（可选） getAllInfo: http://uid.sipac.gov.cn/open/api/identity/data/FindUserById +#法人库-企业联络人员（统一社会信用代码）和法人库-法人基本信息（统一社会信用代码）生产环境 +enterpriseUrl: http://172.21.10.46/api/invoke diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml index 81a6a62..aaafcde 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsDeclarationRecordsMapper.xml @@ -77,14 +77,14 @@ a.update_by, a.update_time, a.remark, - b.enterprise_name, + b.qymc as enterpriseName, f.road, f.enterprise_directory FROM bms_declaration_records AS a inner join bms_template_record f on a.template_record_id = f.id LEFT JOIN bms_template_info c on a.template_id = c.id - LEFT JOIN bms_enterprise_basic_info b ON a.credit_code = b.credit_code + LEFT JOIN bms_enterprise_basic_info b ON a.credit_code = b.tyshxydm left join sys_dict_data e on a.status = e.dict_value and e.dict_type='bms_approval_status' and f.enterprise_directory like @@ -126,7 +126,7 @@ SELECT d.approval_status, a.matter, - c.enterprise_name, + c.qymc as enterpriseName, c.id as enterpriseId, a.create_time, a.`status`, @@ -140,7 +140,7 @@ d.approval_time FROM bms_declaration_records a - INNER JOIN bms_enterprise_basic_info c ON a.credit_code = c.credit_code + INNER JOIN bms_enterprise_basic_info c ON a.credit_code = c.tyshxydm INNER JOIN bms_template_record e on a.template_record_id = e.id INNER JOIN bms_template_info i on e.template_id = i.id INNER JOIN bms_approval_info d on a.id=d.declaration_records_id and is_before_data = 0 @@ -148,7 +148,7 @@ and e.enterprise_directory like concat('%', #{enterpriseDirectory}, '%') - and c.enterprise_name like concat('%', + and c.qymc like concat('%', #{enterpriseName}, '%') and a.matter like concat('%', #{matter}, '%') @@ -201,7 +201,7 @@ a.update_by, a.update_time, a.remark, - b.enterprise_name, + b.qymc as enterpriseName, f.road FROM bms_declaration_records AS a @@ -236,7 +236,7 @@ resultType="com.ruoyi.jjh.declaration.entity.vo.BmsMunicipalBureauReviewQueryVo"> SELECT a.id, b.credit_code, - b.enterprise_name, + b.qymc as enterpriseName, a.project_name, a.YEAR, '' as result, @@ -265,7 +265,7 @@ a.update_by, a.update_time, a.remark, - b.enterprise_name, + b.qymc as enterprise_name, f.road FROM bms_declaration_records AS a diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml index f8c60a9..a779e49 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml @@ -3,168 +3,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select id, enterprise_name, credit_code, - legal_entity,business_status,establish_date,registered_capital,statistical_categories,industry_code, - enterprise_type,industry,institution_code,visitors_num,former_name,enroll_address, - enroll_type,business, - is_deleted, create_by, create_time, update_by, update_time, remark from bms_enterprise_basic_info - - - - - + - - insert into bms_enterprise_basic_info - - id, - enterprise_name, - credit_code, - is_deleted, - create_by, - create_time, - update_by, - update_time, - remark, - legal_entity, - business_status, - establish_date, - registered_capital, - enterprise_type, - industry, - institution_code, - visitors_num, - former_name, - enroll_address, - enroll_type, - business, - industry_code, - statistical_categories, - - - #{id}, - #{enterpriseName}, - #{creditCode}, - #{isDeleted}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - #{legalEntity}, - #{businessStatus}, - #{establishDate}, - #{registeredCapital}, - #{enterpriseType}, - #{industry}, - #{institutionCode}, - #{visitorsNum}, - #{formerName}, - #{enrollAddress}, - #{enrollType}, - #{business}, - #{industryCode}, - #{statisticalCategories}, - - - - - update bms_enterprise_basic_info - - enterprise_name = #{enterpriseName}, - credit_code = #{creditCode}, - is_deleted = #{isDeleted}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - legal_entity = #{legalEntity}, - business_status = #{businessStatus}, - establish_date = #{establishDate}, - registered_capital = #{registeredCapital}, - enterprise_type = #{enterpriseType}, - industry = #{industry}, - institution_code = #{institutionCode}, - visitors_num = #{visitorsNum}, - former_name = #{formerName}, - enroll_address = #{enrollAddress}, - enroll_type = #{enrollType}, - business = #{business}, - industry_code = #{industryCode}, - statistical_categories = #{statisticalCategories}, - - where id = #{id} - - - - delete - from bms_enterprise_basic_info - where id = #{id} - - - - delete from bms_enterprise_basic_info where id in - - #{id} - - \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JContactsMapper.xml b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JContactsMapper.xml index 804146c..f80a394 100644 --- a/ruoyi-admin/src/main/resources/mapper/jjh/ent/JContactsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/jjh/ent/JContactsMapper.xml @@ -8,9 +8,8 @@ + select * from j_smart_reminders + + + and rules_name = #{req.rulesName} + + + order by create_time desc + + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 2564393..7b7da94 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -118,6 +118,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter // .antMatchers("/common/**").permitAll() .antMatchers("/system/chief").permitAll() .antMatchers("/system/singlelogin/**").permitAll() + .antMatchers("/jjh/**").permitAll() + + // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated()