添加材料排序

fill-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -177,6 +177,10 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         if (!ObjectUtils.isEmpty(entity.getTemplatePath())) {
             parseDocxToJson(entity);
         }
+
+        int sort = this.count(new MatterDatumQuery(), context);
+        entity.setSort(sort);
+
     }
 
     @Override
@@ -544,7 +548,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
             }
         });
 
-        if (ObjectUtils.isEmpty(list)&&!ObjectUtils.isEmpty(params.getMateriaFullName())) {
+        if (ObjectUtils.isEmpty(list) && !ObjectUtils.isEmpty(params.getMateriaFullName())) {
             //添加更新热门词汇
             HotwordEntity hotwordEntity = hotwordService.selectOne(new HotwordQuery().siteId(params.getSiteId()).hotwords(params.getMateriaFullName()), context);
             if (ObjectUtils.isEmpty(hotwordEntity)) {

fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

@@ -80,6 +80,7 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
     protected void doListBefore(MatterDatumEntity query, Map<String, Object> model, Context context) throws AppException {
         List<OrderCol> orderColList = new ArrayList<>();
         orderColList.add(new OrderCol("isRecommend", OrderCol.DESCENDING));
+        orderColList.add(new OrderCol("sort", OrderCol.DESCENDING));
         orderColList.add(new OrderCol("createTime", OrderCol.DESCENDING));
         query.setOrderColList(orderColList);
         super.doListBefore(query, model, context);

fill-manager/src/main/java/com/mortals/xhx/module/skin/service/impl/SkinServiceImpl.java

 package com.mortals.xhx.module.skin.service.impl;
 
-import com.alibaba.fastjson.JSON;
-import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.common.pdu.device.DeviceMsgReqPdu;
-import com.mortals.xhx.feign.device.IDeviceMessageFeign;
 import com.mortals.xhx.module.skin.dao.SkinDao;
 import com.mortals.xhx.module.skin.model.SkinEntity;
 import com.mortals.xhx.module.skin.service.SkinService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 /**
-* SkinService
-* 皮肤 service实现
-*
-* @author zxfei
-* @date 2023-04-03
-*/
+ * SkinService
+ * 皮肤 service实现
+ *
+ * @author zxfei
+ * @date 2023-04-03
+ */
 @Service("skinService")
 @Slf4j
 public class SkinServiceImpl extends AbstractCRUDServiceImpl<SkinDao, SkinEntity, Long> implements SkinService {
 
-    @Autowired
-    private IDeviceMessageFeign deviceMessageFeign;
-
 
     @Override
     protected void updateBefore(SkinEntity entity, Context context) throws AppException {
         super.updateBefore(entity, context);
 
-        if(YesNoEnum.YES.getValue()==entity.getUsed()){
+        if (YesNoEnum.YES.getValue() == entity.getUsed()) {
             //修改非当前皮肤都未未使用
             SkinEntity skinEntity = new SkinEntity();
             skinEntity.setUsed(YesNoEnum.NO.getValue());
 
             SkinEntity condition = new SkinEntity();
             condition.setUsed(YesNoEnum.YES.getValue());
-            this.updateBatch(skinEntity,condition,context);
+            this.updateBatch(skinEntity, condition, context);
         }
     }
 
-    @Override
-    protected void updateAfter(SkinEntity entity, Context context) throws AppException {
-        //推送皮肤更新消息
-        DeviceMsgReqPdu deviceMsgReqPdu = new DeviceMsgReqPdu();
-        deviceMsgReqPdu.setSiteid(entity.getSiteId());
-        deviceMsgReqPdu.setProductCode("tdj");
-        deviceMsgReqPdu.setMessageType("edition");
-        deviceMsgReqPdu.setData("W10=");
-        deviceMsgReqPdu.setTimestamp(System.currentTimeMillis());
-        Rest<String> rest = deviceMessageFeign.callbackByProduct(deviceMsgReqPdu);
-        log.info("send device message==>{}", JSON.toJSONString(rest));
-    }
 }
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/skin/web/SkinController.java

 package com.mortals.xhx.module.skin.web;
 
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.pdu.device.DeviceMsgReqPdu;
+import com.mortals.xhx.feign.device.IDeviceMessageFeign;
 import com.mortals.xhx.module.skin.model.SkinEntity;
 import com.mortals.xhx.module.skin.service.SkinService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,11 +26,15 @@ import java.util.Map;
 */
 @RestController
 @RequestMapping("skin")
+@Slf4j
 public class SkinController extends BaseCRUDJsonBodyMappingController<SkinService,SkinEntity,Long> {
 
     @Autowired
     private ParamService paramService;
 
+    @Autowired
+    private IDeviceMessageFeign deviceMessageFeign;
+
     public SkinController(){
         super.setModuleDesc( "皮肤");
     }
@@ -37,4 +47,18 @@ public class SkinController extends BaseCRUDJsonBodyMappingController<SkinServic
     }
 
 
+    @Override
+    protected int saveAfter(SkinEntity entity, Map<String, Object> model, Context context) throws AppException {
+        //推送皮肤更新消息
+        DeviceMsgReqPdu deviceMsgReqPdu = new DeviceMsgReqPdu();
+        deviceMsgReqPdu.setSiteid(entity.getSiteId());
+        deviceMsgReqPdu.setProductCode("tdj");
+        deviceMsgReqPdu.setMessageType("edition");
+        deviceMsgReqPdu.setData("W10=");
+        deviceMsgReqPdu.setTimestamp(System.currentTimeMillis());
+        Rest<String> rest = deviceMessageFeign.callbackByProduct(deviceMsgReqPdu);
+        log.info("send device message==>{}", JSON.toJSONString(rest));
+
+        return super.saveAfter(entity, model, context);
+    }
 }
\ No newline at end of file