Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java

@@ -16,7 +16,6 @@ import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.dto.CustomerSearchDto;
 import com.dsk.system.service.ICustomerService;
 import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.ObjectUtils;
@@ -68,6 +67,23 @@ public class CustomerController extends BaseController {
     @PostMapping()
     @RepeatSubmit
     public AjaxResult add(@RequestBody Customer customer) {
+        dealWithcustomerData(customer);
+        return AjaxResult.success(baseService.add(customer));
+    }
+
+    /**
+     * 认领客户
+     */
+//    @PreAuthorize("@ss.hasPermi('customer:claim')")
+    @PostMapping("/claim")
+    @RepeatSubmit
+    public AjaxResult claim(@RequestBody Customer customer) {
+        if (ObjectUtils.isEmpty(customer.getUipId())) throw new BeanException("城投uipId不能为空");
+        dealWithcustomerData(customer);
+        return AjaxResult.success(baseService.add(customer));
+    }
+
+    private void dealWithcustomerData(Customer customer){
         if (ObjectUtils.isEmpty(customer.getCompanyName())) throw new BeanException("企业名称不能为空");
         if (ObjectUtils.isEmpty(customer.getCompanyId())) {
             try {
@@ -79,7 +95,6 @@ public class CustomerController extends BaseController {
                 logger.debug("获取企业id错误！error：{}", e.getMessage());
             }
         }
-        return AjaxResult.success(baseService.add(customer));
     }
 
     /**

dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/RegionalEconomicDataController.java

 package com.dsk.web.controller.search.macroMarket;
 
 import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
+import com.dsk.common.dtos.OpRegionalEconomicDataRegionalListDto;
+import com.dsk.common.dtos.OpRegionalEconomicDataStatisticsRegionalDto;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
 import com.dsk.system.service.EconomicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+
 
 /**
  * @ClassName RegionalEconomicDataController
@@ -30,7 +33,7 @@ public class RegionalEconomicDataController {
      *@date: 2023/5/18 10:29
      */
     @PostMapping("/national/nationalPage")
-    public AjaxResult nationalPage(@RequestBody OpRegionalEconomicDataV1PageDto dto) {
+    public AjaxResult nationalPage(@RequestBody @Valid OpRegionalEconomicDataV1PageDto dto) {
         return economicService.nationalPage(dto);
     }
 
@@ -55,7 +58,7 @@ public class RegionalEconomicDataController {
      *@date: 2023/5/18 10:29
      */
     @PostMapping("/statistics/regional")
-    public AjaxResult statisticsRegional(@RequestBody OpRegionalEconomicDataV1Dto dto) {
+    public AjaxResult statisticsRegional(@RequestBody OpRegionalEconomicDataStatisticsRegionalDto dto) {
         return economicService.statisticsRegional(dto);
     }
 
@@ -67,7 +70,7 @@ public class RegionalEconomicDataController {
      *@date: 2023/5/18 10:29
      */
     @PostMapping("/regional/list")
-    public AjaxResult regionalList(@RequestBody OpRegionalEconomicDataV1Dto dto) {
+    public AjaxResult regionalList(@RequestBody OpRegionalEconomicDataRegionalListDto dto) {
         return economicService.regionalList(dto);
     }
 

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicDataRegionalListDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName OpRegionalEconomicDataV1Dto
+ * @Description 专项债-项目类别统计
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataRegionalListDto {
+
+    /**
+     * 省Id
+     */
+    @NotNull(message = "provinceId 不能为空")
+    private Integer provinceId;
+
+    /**
+     * 市Id
+     */
+    private Integer cityId;
+
+    /**
+     * 区Id
+     */
+    private Integer areaId;
+}

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicDataStatisticsRegionalDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName OpRegionalEconomicDataV1Dto
+ * @Description 专项债-项目类别统计
+ * @Author Dgm
+ * @Date 2023/5/23 14:05
+ * @Version
+ */
+@Data
+public class OpRegionalEconomicDataStatisticsRegionalDto {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id 不能为空")
+    private Integer id;
+
+    /**
+     * 年份
+     */
+    private Integer year;
+
+    /**
+     * 省Id
+     */
+    private Integer provinceId;
+
+    /**
+     * 市Id
+     */
+    private Integer cityId;
+
+    /**
+     * 区Id
+     */
+    private Integer areaId;
+}

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicDataV1PageDto.java

@@ -3,6 +3,7 @@ package com.dsk.common.dtos;
 import com.dsk.common.core.domain.model.BasePage;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -18,6 +19,7 @@ public class OpRegionalEconomicDataV1PageDto extends BasePage {
     /**
      * 年份
      */
+    @NotNull(message = "year 不能为空")
     private Integer year;
     /**
      * 省

dsk-common/src/main/java/com/dsk/common/dtos/UrbanInvestmentPlatformDto.java

@@ -3,6 +3,8 @@ package com.dsk.common.dtos;
 import com.dsk.common.core.domain.model.BasePage;
 import lombok.Data;
 
+import java.util.List;
+
 
 /**
  * @ClassName UrbanInvestmentPlatformDto
@@ -21,41 +23,41 @@ public class UrbanInvestmentPlatformDto extends BasePage {
     /**
      * 城投业务类型
      */
-    private String uipBusinessType;
+    private List<String> uipBusinessType;
     /**
      * 主体评级
      */
-    private String bratingSubjectLevel;
+    private List<String> bratingSubjectLevel;
     /**
      * 股东背景
      */
-    private String shareholderBg;
+    private List<String> shareholderBg;
     /**
      * 股权关系
      */
-    private String equityRelationship;
+    private List<String> equityRelationship;
     /**
      * 平台重要性
      */
-    private String platformImportance;
+    private List<String> platformImportance;
 
     /**
      * 所属开发区
      */
-    private String developmentZone;
+    private List<String> developmentZone;
 
     /**
      * 省
      */
-    private Integer provinceId;
+    private List<Integer> provinceIds;
     /**
      * 市
      */
-    private Integer cityId;
+    private List<Integer> cityIds;
     /**
      * 区
      */
-    private Integer areaId;
+    private List<Integer> areaIds;
 
     /**
      * 关键词

dsk-operate-ui/src/views/login.vue

 <template>
   <div class="login">
+    <div class="content">
+      <div class="left">
+        <img class="logo" src="../assets/images/logo1.png" />
+        <img class="img" src="../assets/images/login/img.png" />
+      </div>
       <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
         <h3 class="title"><img src="../assets/images/title_icon.png"/>欢迎登录系统</h3>
         <el-form-item prop="username">
@@ -55,6 +60,7 @@
         </el-form-item>
       </el-form>
     </div>
+  </div>
 </template>
 
 <script>
@@ -153,12 +159,32 @@ export default {
 
 <style rel="stylesheet/scss" lang="scss">
 .login {
-  display: flex;
+  /*display: flex;*/
   justify-content: center;
   align-items: center;
   height: 100%;
   background-image: url("../assets/images/login_bg.png");
   background-size: cover;
+  overflow-y: hidden;
+  .content{
+    width: 1320px;
+    margin: 0 auto;
+    padding-top: 160px;
+  }
+  .left{
+    float: left;
+    width: 730px;
+    margin-right: 170px;
+  }
+  .logo{
+    width: 317px;
+    height: 69px;
+    margin-bottom: 58px;
+  }
+  .img{
+    width: 730px;
+    height: 624px;
+  }
 }
 .title {
   padding: 46px 0 32px 48px;
@@ -177,6 +203,8 @@ export default {
   border-radius: 6px;
   background: #ffffff;
   width: 420px;
+  float: right;
+  margin-top: 70px;
   /*padding: 25px 25px 5px 25px;*/
   .el-form-item{
     padding: 0 48px;

dsk-system/src/main/java/com/dsk/system/service/EconomicService.java

 package com.dsk.system.service;
 
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.OpRegionalEconomicDataRegionalListDto;
+import com.dsk.common.dtos.OpRegionalEconomicDataStatisticsRegionalDto;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
 
@@ -39,7 +41,7 @@ public interface EconomicService {
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult statisticsRegional(OpRegionalEconomicDataV1Dto dto);
+    AjaxResult statisticsRegional(OpRegionalEconomicDataStatisticsRegionalDto dto);
 
     /***
      *@Description: 地区经济-分页列表
@@ -48,7 +50,7 @@ public interface EconomicService {
      *@Author: Dgm
      *@date: 2023/5/18 10:25
      */
-    AjaxResult regionalList(OpRegionalEconomicDataV1Dto dto);
+    AjaxResult regionalList(OpRegionalEconomicDataRegionalListDto dto);
 
     /***
      *@Description: 地区经济-分页列表

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java

@@ -76,6 +76,7 @@ public class CustomerServiceImpl implements ICustomerService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean add(Customer customer) {
+        if (ObjectUtils.isEmpty(customer.getUipId())) {
             try {
                 R res = enterpriseService.getUipId(customer.getCompanyName());
                 if (!ObjectUtils.isEmpty(res.getData())) {
@@ -84,7 +85,7 @@ public class CustomerServiceImpl implements ICustomerService {
             } catch (Exception e) {
                 log.error("获取城投平台企业id错误！error：{}", e.getMessage());
             }
-
+        }
         Long userId = SecurityUtils.getUserId();
         customer.setCreateId(userId);
         customer.setUpdateId(userId);

dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java

@@ -2,6 +2,8 @@ package com.dsk.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.OpRegionalEconomicDataRegionalListDto;
+import com.dsk.common.dtos.OpRegionalEconomicDataStatisticsRegionalDto;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1Dto;
 import com.dsk.common.dtos.OpRegionalEconomicDataV1PageDto;
 import com.dsk.common.utils.DskOpenApiUtil;
@@ -40,13 +42,13 @@ public class EconomicServiceImpl implements EconomicService {
     }
 
     @Override
-    public AjaxResult statisticsRegional(OpRegionalEconomicDataV1Dto dto) {
+    public AjaxResult statisticsRegional(OpRegionalEconomicDataStatisticsRegionalDto dto) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/statistics/regional",  BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult regionalList(OpRegionalEconomicDataV1Dto dto) {
+    public AjaxResult regionalList(OpRegionalEconomicDataRegionalListDto dto) {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/regional/list",  BeanUtil.beanToMap(dto, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }