update

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

@@ -4,10 +4,16 @@ 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 org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 public interface SysTenantConfigDao extends BaseDAO<Integer, SysTenantConfig> {
 
-    SysConfig queryALl(Map<String, Object> params);
+    List<SysConfig> queryALl(Map<String, Object> params);
+
+    void delByConfigId(@Param("configIdList") List<Long> configIdList, @Param("tenantId") Integer tenantId);
+
+    void batchInsert(@Param("sysConfigs") List<SysConfig> sysConfigs, @Param("tenantId") Integer tenantId);
 }

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

@@ -4,9 +4,12 @@ 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.List;
 import java.util.Map;
 
 public interface SysTenantConfigService extends BaseService<Integer, SysTenantConfig> {
 
-    SysConfig queryAll(Map<String, Object> params);
+    List<SysConfig> queryAll(Map<String, Object> params);
+
+    void batchUpSet(List<SysConfig> sysConfigs, Integer tenantId);
 }

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

@@ -8,8 +8,11 @@ import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTenantConfig>  implements SysTenantConfigService {
@@ -23,7 +26,18 @@ public class SysTenantConfigServiceImpl extends BaseServiceImpl<Integer, SysTena
 	}
 
 	@Override
-	public SysConfig queryAll(Map<String, Object> params) {
+	public List<SysConfig> queryAll(Map<String, Object> params) {
 		return sysTenantConfigDao.queryALl(params);
 	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void batchUpSet(List<SysConfig> sysConfigs, Integer tenantId) {
+		if(sysConfigs == null || sysConfigs.size() == 0){
+			return;
+		}
+		List<Long> configIdList = sysConfigs.stream().map(e -> e.getId()).collect(Collectors.toList());
+		sysTenantConfigDao.delByConfigId(configIdList,tenantId);
+		sysTenantConfigDao.batchInsert(sysConfigs,tenantId);
+	}
 }

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

@@ -13,14 +13,21 @@
     id_, sys_config_id_, tenant_id_, param_value_, create_time_, update_time_
   </sql>
   <select id="get" parameterType="java.lang.Integer" resultMap="SysTenantConfig">
-    select 
+    SELECT
     <include refid="Base_Column_List" />
-    from sys_tenant_config
-    where id_ = #{id,jdbcType=INTEGER}
+    FROM sys_tenant_config
+    WHERE id_ = #{id,jdbcType=INTEGER}
   </select>
   <delete id="delete" parameterType="java.lang.Integer">
-    delete from sys_tenant_config
-    where id_ = #{id,jdbcType=INTEGER}
+    DELETE FROM sys_tenant_config
+    WHERE id_ = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="delByConfigId">
+    DELETE FROM sys_tenant_config WHERE tenant_id_ = #{tenantId}
+    AND sys_config_id_ IN
+    <foreach collection="configIdList" open="(" close=")" item="configId" separator=",">
+      #{configId}
+    </foreach>
   </delete>
   <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.SysTenantConfig" useGeneratedKeys="true">
     insert into sys_tenant_config (sys_config_id_, tenant_id_, param_value_,
@@ -28,42 +35,12 @@
     values (#{sysConfigId,jdbcType=INTEGER}, #{tenantId,jdbcType=INTEGER}, #{paramValue,jdbcType=VARCHAR},
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
-  <insert id="insertSelective" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.SysTenantConfig" useGeneratedKeys="true">
-    insert into sys_tenant_config
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="sysConfigId != null">
-        sys_config_id_,
-      </if>
-      <if test="tenantId != null">
-        tenant_id_,
-      </if>
-      <if test="paramValue != null">
-        param_value_,
-      </if>
-      <if test="createTime != null">
-        create_time_,
-      </if>
-      <if test="updateTime != null">
-        update_time_,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="sysConfigId != null">
-        #{sysConfigId,jdbcType=INTEGER},
-      </if>
-      <if test="tenantId != null">
-        #{tenantId,jdbcType=INTEGER},
-      </if>
-      <if test="paramValue != null">
-        #{paramValue,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-    </trim>
+  <insert id="batchInsert">
+    INSERT INTO sys_tenant_config (sys_config_id_, tenant_id_, param_value_,create_time_, update_time_)
+    VALUES
+    <foreach collection="sysConfigs" item="item" separator=",">
+      (#{item.id}, #{tenantId}, #{item.paranValue},NOW(),NOW())
+    </foreach>
   </insert>
   <update id="update" parameterType="com.ym.mec.biz.dal.entity.SysTenantConfig">
     update sys_tenant_config

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

@@ -3,21 +3,14 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.SysConfig;
-import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysTenantConfigService;
 import com.ym.mec.common.controller.BaseController;
 import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Date;
+import org.springframework.web.bind.annotation.*;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -50,9 +43,9 @@ public class SysTenantConfigController extends BaseController {
 	@PostMapping(value = "batchUpSet")
     @PreAuthorize("@pcs.hasPermissions('sysTenantConfig/batchUpSet')")
 	@AuditLogAnnotation(operateName = "批量调整配置文件")
-	public Object batchUpSet(SysConfig config) {
-		config.setModifyOn(new Date());
-//		sysConfigService.update(config);
+	public Object batchUpSet(@RequestBody List<SysConfig> sysConfigs) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		sysTenantConfigService.batchUpSet(sysConfigs,sysUser.getTenantId());
 		return succeed();
 	}