update

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysTenantConfigDao.java

@@ -1,9 +1,13 @@
 package com.ym.mec.biz.dal.dao;
 
 
+import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.biz.dal.entity.SysTenantConfig;
 import com.ym.mec.common.dal.BaseDAO;
 
+import java.util.Map;
+
 public interface SysTenantConfigDao extends BaseDAO<Integer, SysTenantConfig> {
 
+    SysConfig queryALl(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SysTenantConfigService.java

@@ -1,7 +1,12 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.biz.dal.entity.SysTenantConfig;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.Map;
+
 public interface SysTenantConfigService extends BaseService<Integer, SysTenantConfig> {
+
+    SysConfig queryAll(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysTenantConfigServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.SysTenantConfigDao;
+import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.biz.dal.entity.SysTenantConfig;
 import com.ym.mec.biz.service.SysTenantConfigService;
 import com.ym.mec.common.dal.BaseDAO;
@@ -8,6 +9,8 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 @Service
 public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTenantConfig>  implements SysTenantConfigService {
 	
@@ -18,4 +21,9 @@ public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTena
 	public BaseDAO<Integer, SysTenantConfig> getDAO() {
 		return sysTenantConfigDao;
 	}
+
+	@Override
+	public SysConfig queryAll(Map<String, Object> params) {
+		return sysTenantConfigDao.queryALl(params);
+	}
 }

mec-biz/src/main/resources/config/mybatis/SysTenantConfigMapper.xml

@@ -99,10 +99,15 @@
   </select>
 
   <select id="findAll" resultMap="SysTenantConfig">
-    SELECT * FROM sys_config where 1=1
+    SELECT * FROM sys_config
+  </select>
+  <select id="queryALl" resultMap="com.ym.mec.biz.dal.dao.SysConfigDao.SysConfig">
+    SELECT sc.id_,sc.param_name_,sc.group_,CASE WHEN stc.id_ IS NULL THEN sc.paran_value_ ELSE stc.param_value_ END paran_value_ FROM sys_config sc
+    LEFT JOIN sys_tenant_config stc ON sc.id_ = stc.sys_config_id_ AND sc.group_ = #{tenantId}
+    WHERE sc.group_ IS NOT NULL AND sc.group_ != ''
     <if test="group != null">
-      and group_ = #{group}
+      AND sc.group_ = #{group}
     </if>
-    ORDER BY id_
+    ORDER BY sc.group_
   </select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/SysTenantConfigController.java

@@ -27,7 +27,7 @@ import java.util.Map;
  */
 @RestController
 @Api(tags = "系统参数设置")
-@RequestMapping(value = "sysConfig")
+@RequestMapping(value = "sysTenantConfig")
 public class SysTenantConfigController extends BaseController {
 
 	@Autowired
@@ -36,21 +36,21 @@ public class SysTenantConfigController extends BaseController {
 	private SysUserFeignService sysUserFeignService;
 
 	@ApiOperation(value = "参数列表")
-	@GetMapping(value = "list")
-    @PreAuthorize("@pcs.hasPermissions('sysConfig/list')")
-	public Object configList(String group) {
+	@GetMapping(value = "queryAll")
+    @PreAuthorize("@pcs.hasPermissions('sysTenantConfig/queryAll')")
+	public Object queryAll(String group) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		Map<String,Object> params = new HashMap<String, Object>(2);
 		params.put("group", group);
 		params.put("tenantId", sysUser.getTenantId());
-		return succeed(sysTenantConfigService.findAll(params));
+		return succeed(sysTenantConfigService.queryAll(params));
 	}
 
-	@ApiOperation(value = "修改参数")
-	@PostMapping(value = "update")
-    @PreAuthorize("@pcs.hasPermissions('sysConfig/update')")
-	@AuditLogAnnotation(operateName = "修改参数")
-	public Object update(SysConfig config) {
+	@ApiOperation(value = "批量调整配置文件")
+	@PostMapping(value = "batchUpSet")
+    @PreAuthorize("@pcs.hasPermissions('sysTenantConfig/batchUpSet')")
+	@AuditLogAnnotation(operateName = "批量调整配置文件")
+	public Object batchUpSet(SysConfig config) {
 		config.setModifyOn(new Date());
 //		sysConfigService.update(config);
 		return succeed();