租户管理-系统配置-相关接口上传

fiveep-controller/src/main/java/com/bizmatics/controller/web/SysTenantConfigController.java

@@ -2,15 +2,19 @@ package com.bizmatics.controller.web;
 
 
 import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.model.SysTenant;
 import com.bizmatics.model.SysTenantConfig;
 import com.bizmatics.model.vo.SysTenantConfigVo;
+import com.bizmatics.model.vo.SysTenantOneVo;
+import com.bizmatics.service.PatrolInspectionDeviceService;
 import com.bizmatics.service.SysTenantConfigService;
+import com.bizmatics.service.SysTenantService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -25,6 +29,12 @@ public class SysTenantConfigController {
     @Autowired
     private SysTenantConfigService sysTenantConfigService;
 
+    @Autowired
+    private SysTenantService sysTenantService;
+
+    @Autowired
+    private PatrolInspectionDeviceService patrolInspectionDeviceService;
+
     /**
      * 登录页-样式配置查询
      *
@@ -45,5 +55,62 @@ public class SysTenantConfigController {
     public ApiResult<List<SysTenantConfig>> getMiddleConfig() {
         return ApiResult.success(sysTenantConfigService.getMiddleConfig());
     }
+
+
+    /**
+     * 租户管理-系统配置-主列表查询
+     * @param sysTenantOneVo
+     * @return
+     */
+    @PostMapping("getTenantData")
+    public ApiResult<CommonPage<SysTenant>> getTenantData(@RequestBody SysTenantOneVo sysTenantOneVo) {
+        return ApiResult.success(sysTenantService.getTenantData(sysTenantOneVo));
+    }
+
+    /**
+     * 租户管理-系统配置-租户配置查询
+     * @param tenantId 租户ID
+     * @return
+     */
+    @GetMapping("/getMiddleConfigList")
+    public ApiResult<List<SysTenantConfig>> getMiddleConfigList(@RequestParam Integer tenantId) {
+        return ApiResult.success(sysTenantConfigService.getMiddleConfigList(tenantId));
+    }
+
+    /**
+     * 租户管理-系统配置-租户配置新增
+     * @param sysTenantConfig
+     * @return
+     */
+    @PostMapping("addMiddleConfig")
+    public ApiResult<Void> addMiddleConfig(@RequestBody SysTenantConfig sysTenantConfig) {
+        sysTenantConfigService.addMiddleConfig(sysTenantConfig);
+        return ApiResult.success();
+    }
+
+    /**
+     * 租户管理-系统配置-租户配置修改
+     * @param sysTenantConfig
+     * @return
+     */
+    @PostMapping("updaMiddleConfig")
+    public ApiResult<Void> updaMiddleConfig(@RequestBody SysTenantConfig sysTenantConfig) {
+        sysTenantConfigService.updaMiddleConfig(sysTenantConfig);
+        return ApiResult.success();
+    }
+
+    /**
+     * 租户管理-系统配置-图片上传
+     * @param file 图片
+     * @param request
+     * @return
+     */
+    @PostMapping("pictureUpload")
+    public ApiResult<String> c(@RequestParam(value = "file", required = false) MultipartFile file, HttpServletRequest request
+    ) {
+        return ApiResult.success(patrolInspectionDeviceService.pictureUpload(file, request));
+    }
+
+
 }
 

fiveep-controller/src/main/resources/application-prod.properties

@@ -1,7 +1,7 @@
 debug=true
 spring.main.lazy-initialization=false
 spring.main.allow-bean-definition-overriding=true
-temp.basedir=C:/Users/jichaobo/Desktop
+temp.basedir=C:/Users/jichaobo/Desktop/uskyfile
 # application
 server.port=8011
 # mybatis-plus

fiveep-model/src/main/java/com/bizmatics/model/SysTenantConfig.java

@@ -118,5 +118,15 @@ public class SysTenantConfig implements Serializable {
      */
     private LocalDateTime updateTime;
 
+    /**
+     * 标签页图标
+     */
+    private String labelIcon;
+
+    /**
+     * 是否开启中间页：0 否 1 是
+     */
+    private Integer middleStatus;
+
 
 }

fiveep-persistence/src/main/resources/mapper/mysql/SysTenantConfigMapper.xml

@@ -23,6 +23,8 @@
         <result column="create_time" property="createTime" />
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
+        <result column="label_icon" property="labelIcon" />
+        <result column="middle_status" property="middleStatus" />
     </resultMap>
     <select id="getTenantConfig" resultType="com.bizmatics.model.vo.SysTenantConfigVo">
         SELECT

fiveep-service/src/main/java/com/bizmatics/service/SysTenantConfigService.java

@@ -18,4 +18,10 @@ public interface SysTenantConfigService extends CrudService<SysTenantConfig> {
     List<SysTenantConfigVo> getTenantConfig(String url);
 
     List<SysTenantConfig> getMiddleConfig();
+
+    List<SysTenantConfig> getMiddleConfigList(Integer tenantId);
+
+    void addMiddleConfig(SysTenantConfig sysTenantConfig);
+
+    void updaMiddleConfig(SysTenantConfig sysTenantConfig);
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/SysTenantConfigServiceImpl.java

@@ -18,6 +18,7 @@ import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -50,4 +51,26 @@ public class SysTenantConfigServiceImpl extends AbstractCrudService<SysTenantCon
         List<SysTenantConfig> list = this.list(queryWrapper);
         return list;
     }
+
+
+    @Override
+    public List<SysTenantConfig> getMiddleConfigList(Integer tenantId) {
+        LambdaQueryWrapper<SysTenantConfig> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(SysTenantConfig::getTenantId, tenantId);
+        List<SysTenantConfig> list = this.list(queryWrapper);
+        return list;
+    }
+
+    @Override
+    public void addMiddleConfig(SysTenantConfig sysTenantConfig){
+        sysTenantConfig.setCreateBy(SecurityUtils.getUser().getUserName());
+        sysTenantConfig.setCreateTime(LocalDateTime.now());
+        this.save(sysTenantConfig);
+    }
+    @Override
+    public void updaMiddleConfig(SysTenantConfig sysTenantConfig){
+        sysTenantConfig.setUpdateBy(SecurityUtils.getUser().getUserName());
+        sysTenantConfig.setUpdateTime(LocalDateTime.now());
+        this.updateById(sysTenantConfig);
+    }
 }