添加服务检测拉起脚本

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -174,9 +174,14 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
     protected void saveBefore(SiteEntity entity, Context context) throws AppException {
         List<SiteEntity> siteEntities = this.find(new SiteQuery().areaCode(entity.getAreaCode()));
         entity.setSiteCode(entity.getAreaCode() + Constant.SITE_SPLIT_MARK + StringUtils.lpad(siteEntities.size() + 1, Constant.SITE_CODE_NUM));
+
+
         super.saveBefore(entity, context);
     }
 
+
+
+
     @Override
     protected void saveAfter(SiteEntity entity, Context context) throws AppException {
         //刷新站点树
@@ -189,23 +194,14 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
             userService.updateUserList(list.getData().getData());
         }
-
         //更新同步部门相关
         deptService.syncDeptBySiteId(entity, context);
-
-        if (refresh) {
-            //通知设备更新站点信息
-            DevicePdu devicePdu = new DevicePdu();
-            devicePdu.setSiteId(entity.getId());
-            Rest<Void> rest1 = deviceFeign.refreshMessage(devicePdu);
-            log.info("调用刷新结果：{}", JSON.toJSONString(rest1));
-            refresh = false;
-        }
-
         super.saveAfter(entity, context);
     }
 
 
+
+
     @Override
     public List<SiteTreeSelect> siteTree(Context context) {
         Map<String, AreaEntity> areaMap = new HashMap<>();
@@ -327,7 +323,14 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
             Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
             userService.updateUserList(list.getData().getData());
         }
-
+        if (refresh) {
+            //通知设备更新站点信息
+            DevicePdu devicePdu = new DevicePdu();
+            devicePdu.setSiteId(entity.getId());
+            Rest<Void> rest1 = deviceFeign.refreshMessage(devicePdu);
+            log.info("调用刷新结果：{}", JSON.toJSONString(rest1));
+            refresh = false;
+        }
 
         super.updateAfter(entity, context);
     }

base-manager/src/main/java/com/mortals/xhx/module/skin/model/vo/SkinFieldVo.java

@@ -19,4 +19,8 @@ public class SkinFieldVo extends BaseEntityLong {
 
     /** 结束 皮肤id */
     private Long skinIdEnd;
+
+    //附件图片访问实际地址
+    private String fieldValueUrl;
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinBaseServiceImpl.java

@@ -11,6 +11,7 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.upload.service.UploadService;
+import com.mortals.xhx.common.code.FiletypeEnum;
 import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.common.utils.BeanUtil;
 import com.mortals.xhx.common.utils.FreeMarkerUtils;
@@ -79,22 +80,27 @@ public class SkinBaseServiceImpl extends AbstractCRUDServiceImpl<SkinBaseDao, Sk
         Map<String, String> imageResolutionMap = paramService.getParamBySecondOrganize("SkinBase", "imageResolution");
         list.stream().forEach(item -> {
             List<SkinFieldEntity> skinFieldEntities = skinFieldService.find(new SkinFieldQuery().skinId(item.getId()));
+            String domain = GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/");
+            skinFieldEntities.forEach(field -> {
+                if ("2".equals(field.getFieldType())) {
+                    UrlBuilder builder = UrlBuilder.ofHttp(domain, CharsetUtil.CHARSET_UTF_8).addPath(field.getFieldValue());
+                    field.setFieldValueUrl(builder.build());
+                }
+            });
+
             ProductEntity productEntity = productService.get(item.getProductId());
             item.setProductCode(productEntity == null ? "" : productEntity.getProductCode());
             item.setImageResolutionValue(imageResolutionMap.get(entity.getImageResolution() == null ? "1" : entity.getImageResolution()));
             item.setSkinFieldList(skinFieldEntities);
-            String domain = GlobalSysInfo.getParamValue(Constant.DOMAIN, "http://192.168.0.98:11071/");
             if (!ObjectUtils.isEmpty(item.getPreviewImagePath())) {
                 UrlBuilder builder = UrlBuilder.ofHttp(domain, CharsetUtil.CHARSET_UTF_8).addPath(item.getPreviewImagePath());
                 item.setPreviewImagePath(builder.build());
-                log.info("cssUrl:" + URLDecoder.decode(item.getPreviewImagePath(), CharsetUtil.CHARSET_UTF_8));
-
+                //log.info("cssUrl:" + URLDecoder.decode(item.getPreviewImagePath(), CharsetUtil.CHARSET_UTF_8));
             }
             if (!ObjectUtils.isEmpty(item.getCssFilePath())) {
                 UrlBuilder builder = UrlBuilder.ofHttp(domain, CharsetUtil.CHARSET_UTF_8).addPath(item.getCssFilePath());
                 item.setCssFilePath(builder.build());
-                log.info("cssUrl:" + URLDecoder.decode(item.getCssFilePath(), CharsetUtil.CHARSET_UTF_8));
-
+                //log.info("cssUrl:" + URLDecoder.decode(item.getCssFilePath(), CharsetUtil.CHARSET_UTF_8));
             }
         });
         super.findAfter(entity, pageInfo, context, list);

base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml

@@ -26,6 +26,9 @@
                 <if test="condition.matterName != null and condition.matterName != ''">
                     and a.matterName like #{condition.matterName}
                 </if>
+                <if test="condition.source!=null and condition.source!=''">
+                    and a.source = #{condition.source,jdbcType=VARCHAR}
+                </if>
             </trim>
         </trim>
     </select>
@@ -55,6 +58,9 @@
                 <if test="condition.matterName != null and condition.matterName != ''">
                      and a.matterName like #{condition.matterName}
                 </if>
+                <if test="condition.source!=null and condition.source!=''">
+                    and a.source = #{condition.source,jdbcType=VARCHAR}
+                </if>
             </trim>
         </trim>
     </select>