suochencheng 6 سال پیش
والد
کامیت
3e44a6cca9

+ 2 - 0
src/main/java/com/izouma/awesomeadmin/dao/AreaInfoMapper.java

@@ -31,5 +31,7 @@ public interface AreaInfoMapper{
     AreaInfo queryAreaInfo(AreaInfo record);
 
     List<AreaInfo> query(AreaInfo record);
+
+    int defaultAimGroup(AreaInfo areaInfo);
 }
 

+ 6 - 0
src/main/java/com/izouma/awesomeadmin/dao/AreaInfoMapper.xml

@@ -910,6 +910,12 @@
             id in (${idStr})
         </if>
     </update>
+    <update id="defaultAimGroup">
+        UPDATE area_info SET  template_id = #{templateId}
+        where
+            id = #{id,jdbcType=INTEGER}
+            and template_id  is NULL
+    </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.AreaInfo">
         select
         <include refid="Base_Column_List"/>

+ 2 - 0
src/main/java/com/izouma/awesomeadmin/dao/ThingInfoMapper.java

@@ -32,5 +32,7 @@ public interface ThingInfoMapper {
     ThingInfo queryThingInfo(ThingInfo record);
 
     List<ThingInfo> query(ThingInfo record);
+
+    int defaultAimGroup(ThingInfo thingInfo);
 }
 

+ 7 - 0
src/main/java/com/izouma/awesomeadmin/dao/ThingInfoMapper.xml

@@ -935,6 +935,13 @@
             id in (${idStr})
         </if>
     </update>
+    <update id="defaultAimGroup">
+        UPDATE thing_info SET template_id = #{templateId}
+        where
+            id = #{id,jdbcType=INTEGER}
+            and template_id  is NULL
+
+    </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.ThingInfo">
         select
         <include refid="Base_Column_List"/>

+ 25 - 4
src/main/java/com/izouma/awesomeadmin/service/impl/AimGroupInfoServiceImpl.java

@@ -2,9 +2,7 @@ package com.izouma.awesomeadmin.service.impl;
 
 import java.util.*;
 
-import com.izouma.awesomeadmin.dao.AimPlaceInfoMapper;
-import com.izouma.awesomeadmin.dao.AimTemplateMapper;
-import com.izouma.awesomeadmin.dao.ArContentMapper;
+import com.izouma.awesomeadmin.dao.*;
 import com.izouma.awesomeadmin.model.*;
 import javafx.scene.shape.Arc;
 import org.apache.commons.lang.StringUtils;
@@ -14,7 +12,6 @@ import org.springframework.stereotype.Service;
 import com.izouma.awesomeadmin.constant.AppConstant;
 import com.izouma.awesomeadmin.dto.Page;
 import com.izouma.awesomeadmin.service.AimGroupInfoService;
-import com.izouma.awesomeadmin.dao.AimGroupInfoMapper;
 
 /**
  * service接口实现类
@@ -36,6 +33,12 @@ public class AimGroupInfoServiceImpl implements AimGroupInfoService {
     @Autowired
     private ArContentMapper arContentMapper;
 
+    @Autowired
+    private ThingInfoMapper thingInfoMapper;
+
+    @Autowired
+    private AreaInfoMapper areaInfoMapper;
+
     @Override
     public List<AimGroupInfo> getAimGroupInfoList(AimGroupInfo record) {
 
@@ -166,6 +169,24 @@ public class AimGroupInfoServiceImpl implements AimGroupInfoService {
 
                 }
 
+
+                if(StringUtils.isNotEmpty(record.getThingId())){
+                    ThingInfo thingInfo = new ThingInfo();
+                    thingInfo.setId(Integer.valueOf(record.getThingId()));
+                    thingInfo.setTemplateId(String.valueOf(record.getId()));
+                    thingInfoMapper.defaultAimGroup(thingInfo);
+                }else{
+                    if(StringUtils.isNotEmpty(record.getAreaId())&&!"undefined".equals(record.getAreaId())){
+                        AreaInfo areaInfo = new AreaInfo();
+                        areaInfo.setId(Integer.valueOf(record.getAreaId()));
+                        areaInfo.setTemplateId(String.valueOf(record.getId()));
+                        areaInfoMapper.defaultAimGroup(areaInfo);
+
+                    }
+                }
+
+
+
                 return true;
             }
         } catch (Exception e) {