feat:新增浙政钉

zydd-pickup/src/main/java/com/tykj/zydd/pickup/controller/TemplateController.java

@@ -35,4 +35,10 @@ public class TemplateController {
     public void addOrUpdate(@RequestBody TemplateDTO templateDTO){
         templateService.saveTemplate(templateDTO);
     }
+
+    @GetMapping("/deleteById")
+    @ApiOperation(value = "删除模板")
+    public void deleteById(@RequestParam Integer id){
+        templateService.deleteById(id);
+    }
 }

zydd-pickup/src/main/java/com/tykj/zydd/pickup/entity/dto/TemplateDTO.java

@@ -14,6 +14,6 @@ public class TemplateDTO {
     @ApiModelProperty(value = "模板内容")
     private String content;
 
-    @ApiModelProperty(value = "单位id")
-    private String organizationCode;
+//    @ApiModelProperty(value = "单位id")
+//    private String organizationCode;
 }

zydd-pickup/src/main/java/com/tykj/zydd/pickup/service/TemplateService.java

@@ -18,5 +18,9 @@ public interface TemplateService {
      */
     void saveTemplate(TemplateDTO templateDTO);
 
-
+    /**
+     * 逻辑删除模板
+     * @param id
+     */
+    void deleteById(int id);
 }

zydd-pickup/src/main/java/com/tykj/zydd/pickup/service/impl/TemplateServiceImpl.java

@@ -37,19 +37,27 @@ public class TemplateServiceImpl implements TemplateService {
 
     @Override
     public void saveTemplate(TemplateDTO templateDTO) {
+        KxAdmin currentUser = userUtils.getCurrentUser();
         if(templateDTO.getId()!=null){
             Template template = templateDAO.findById(templateDTO.getId()).get();
             BeanUtils.copyProperties(templateDTO, template, "createTime");
+            template.setOrganizationCode(currentUser.getOrganizationCode());
             templateDAO.save(template);
         }else {
             Template template=new Template();
+            template.setOrganizationCode(currentUser.getOrganizationCode());
             BeanUtils.copyProperties(templateDTO, template);
             templateDAO.save(template);
         }
 
     }
 
-
+    @Override
+    public void deleteById(int id) {
+        Template template = templateDAO.findById(id).get();
+        template.setDeleteTag(1);
+        templateDAO.save(template);
+    }
 
 
 }

zydd-union/pom.xml

@@ -44,6 +44,14 @@
             </properties>
         </profile>
 
+<!--        &lt;!&ndash;本地环境&ndash;&gt;-->
+<!--        <profile>-->
+<!--            <id>local</id>-->
+<!--            <properties>-->
+<!--                <pom.package>war</pom.package>-->
+<!--                <activatedProperties>local</activatedProperties>-->
+<!--            </properties>-->
+<!--        </profile>-->
 
         <!--开发环境-->
         <profile>

zydd-union/src/main/resources/application-local.properties

 server.port=8111
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.url=jdbc:mysql://localhost:3306/zzd?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
 spring.datasource.url=jdbc:mysql://localhost:3306/zzd?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=root
@@ -24,8 +25,8 @@ url=????
 
 
 #redis连接配置
-spring.redis.host=127.0.0.1
-spring.redis.password=
+spring.redis.host=192.168.100.232
+spring.redis.password=tykj@2022
 spring.redis.port=6379
 spring.redis.database=14
 # 连接池最大连接数（使用负值表示没有限制）

zydd-user/src/main/java/com/tykj/zydd/user/contorller/UserDataController.java

@@ -41,16 +41,16 @@ public class UserDataController {
 
     @ApiOperation(value = "获取单位（市级 登录信息level为0）")
     @GetMapping("/getUnitList")
-    public List<UnitMunicipalVO> getUnitList(){
-        return userDataService.getUnitList();
+    public List<UnitMunicipalVO> getUnitList(String organizationName){
+        return userDataService.getUnitList(organizationName);
     }
 
 
 
     @ApiOperation(value = "获取区单位")
     @GetMapping("/getUnitVOList")
-    public  List<DistrictUnitVO> getUnitVOList(String organizationCode){
-        return userDataService.getUnitVOList(organizationCode);
+    public  List<DistrictUnitVO> getUnitVOList(String organizationName){
+        return userDataService.getUnitVOList(organizationName);
     }
 
     @ApiOperation(value = "根据单位code获取人员")

zydd-user/src/main/java/com/tykj/zydd/user/entity/vo/UserMessageVO.java

@@ -43,7 +43,6 @@ public class UserMessageVO {
     @ApiModelProperty("自己系统token")
     private String token;
 
-
     @ApiModelProperty("租户id")
     private Integer realmId;
 

zydd-user/src/main/java/com/tykj/zydd/user/security/SecurityConfig.java

@@ -59,8 +59,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 //grace/app
                 .antMatchers("/grace/app/**","/activity/app/**","/record/app/**","/science/ip/**","/admin/login",
                         "/user/getUserMessage","/user/getAccessToken").permitAll()
-//                .anyRequest().authenticated()
-                .anyRequest().permitAll()
+                .anyRequest().authenticated()
+//                .anyRequest().permitAll()
                 .and()
                 .exceptionHandling()
                 .accessDeniedHandler(urlAccessDeniedHandler)

zydd-user/src/main/java/com/tykj/zydd/user/service/UserDataService.java

@@ -16,7 +16,7 @@ public interface UserDataService {
     /**
      * 获取区级单位列表
      */
-    List<DistrictUnitVO> getUnitVOList(String organizationCode);
+    List<DistrictUnitVO> getUnitVOList(String organizationName);
 
     /**
      * 根据单位code查询员工
@@ -37,5 +37,5 @@ public interface UserDataService {
     /**
      * 获取市级单位列表
      */
-    List<UnitMunicipalVO> getUnitList();
+    List<UnitMunicipalVO> getUnitList(String organizationName);
 }

zydd-user/src/main/java/com/tykj/zydd/user/service/impl/UserDataServiceImpl.java

 package com.tykj.zydd.user.service.impl;
 
+import com.github.wenhao.jpa.PredicateBuilder;
+import com.github.wenhao.jpa.Specifications;
 import com.tykj.zydd.misc.util.BeanCopyUtil;
 import com.tykj.zydd.user.dao.SpecificUnitDao;
 import com.tykj.zydd.user.dao.SpecificUserDao;
@@ -43,15 +45,21 @@ public class UserDataServiceImpl implements UserDataService {
     private UserUtils userUtils;
 
     @Override
-    public List<UnitMunicipalVO> getUnitList() {
+    public List<UnitMunicipalVO> getUnitList(String organizationName) {
         List<SpecificUnit> allByLevel;
+        PredicateBuilder<SpecificUnit> predicateBuilder = Specifications.and();
+        if (organizationName!=null){
+            predicateBuilder.like("organizationName","%"+ organizationName+"%");
+        }
+        predicateBuilder.eq("level",1);
+        List<SpecificUnit> all = specificUnitDao.findAll(predicateBuilder.build());
 //        if (StringUtils.isEmpty(organizationName)) {
-            allByLevel = specificUnitDao.findAllByLevel(1);
+//            allByLevel = specificUnitDao.findAllByLevel(1);
 //        } else {
 //            allByLevel = specificUnitDao.findFirstByOrganizationNameAndLevel(organizationName, 1);
 //        }
         List<UnitMunicipalVO> rs=new ArrayList<>();
-        allByLevel.forEach(item->{
+        all.forEach(item->{
             UnitMunicipalVO vo=new UnitMunicipalVO();
             BeanUtils.copyProperties(item,vo);
             rs.add(vo);
@@ -74,16 +82,21 @@ public class UserDataServiceImpl implements UserDataService {
 //    }
 
     @Override
-    public List<DistrictUnitVO> getUnitVOList(String organizationCode) {
-        List<SpecificUnit> allByLevel = specificUnitDao.findAllByLevel(2);
-        List<SpecificUnit> specificUnits;
-        if (organizationCode!=null){
-            specificUnits = allByLevel.stream().filter(a -> a.getOrganizationCode().equals(organizationCode) || a.getParentCode().equals(organizationCode)).collect(Collectors.toList());
-        }else {
-            specificUnits = new ArrayList<>(allByLevel);
+    public List<DistrictUnitVO> getUnitVOList(String organizationName) {
+        PredicateBuilder<SpecificUnit> predicateBuilder = Specifications.and();
+        if (organizationName!=null){
+            predicateBuilder.like("organizationName","%"+ organizationName+"%");
         }
+        predicateBuilder.eq("level",2);
+        List<SpecificUnit> allByLevel = specificUnitDao.findAll(predicateBuilder.build());
+        List<SpecificUnit> specificUnits;
+//        if (organizationName!=null){
+//            specificUnits = allByLevel.stream().filter(a -> a.getOrganizationName().equals(organizationName)).collect(Collectors.toList());
+//        }else {
+//            specificUnits = new ArrayList<>(allByLevel);
+//        }
         List<DistrictUnitVO> rs=new ArrayList<>();
-        Map<String, List<SpecificUnit>> groupedUnits = specificUnits.stream()
+        Map<String, List<SpecificUnit>> groupedUnits = allByLevel.stream()
                 .collect(Collectors.groupingBy(SpecificUnit::getDivisionCode));
         for (Map.Entry<String, List<SpecificUnit>> entry : groupedUnits.entrySet()) {
             String divisionCode = entry.getKey().substring(0,6);