添加材料数量统计

sample-form-client-ui/admin/src/App.vue

@@ -103,13 +103,13 @@ export default {
           ? JSON.parse(this.UrlDecode(this.routeQuery["serveinfo"]))
           : {};
         let serverUrl =
-          this.routeQuery["serverUrl"] || "http://192.168.0.98:11074";
+          this.routeQuery["serverUrl"] || "http://192.168.0.98:11078";
         this.devicenum = this.routeQuery["devicenum"] || "90-2B-34-BF-1B-48";
         if (serveinfo) {
           // **正式环境请打开下面内容**
           // serveinfo["rabbmitInfo"] && this.clientMp(serveinfo["rabbmitInfo"]);
           if (!serveinfo["serviceInfo"]["serverUrl"]) {
-            serverUrl = "http://192.168.0.98:11074";
+            serverUrl = "http://192.168.0.98:11078";
           }
         }
         local.setLocal("baseURL", serverUrl);

sample-form-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java

@@ -12,11 +12,11 @@ import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseJsonBodyController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.common.pdu.device.DevicePdu;
 import com.mortals.xhx.feign.base.IApiBaseManagerFeign;
 import com.mortals.xhx.feign.base.pdu.DeptPdu;
 import com.mortals.xhx.feign.base.pdu.SitePdu;
 import com.mortals.xhx.feign.rsp.ApiResp;
+import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.home.pdu.HomeQueryPdu;
 import com.mortals.xhx.module.hotword.model.HotwordEntity;
 import com.mortals.xhx.module.hotword.model.HotwordQuery;
@@ -50,6 +50,8 @@ public class HomeController extends BaseJsonBodyController {
     private HotwordService hotwordService;
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private ISiteFeign siteFeign;
 
     @PostMapping({"site/list"})
     public Rest<Object> list() {
@@ -176,6 +178,8 @@ public class HomeController extends BaseJsonBodyController {
             model.put("dayThrift", 66);      //今日节约
             model.put("totalThrift", 996);    //累计节约
             model.put("message_info", busiDesc + "成功");
+            Rest<com.mortals.xhx.common.pdu.site.SitePdu> info = siteFeign.info(homeQueryPdu.getSiteId());
+            model.put("title", info.getData().getSiteName()); //标题
             this.recordSysLog(this.request, busiDesc + " 【成功】");
         } catch (Exception var9) {
             code = VALUE_RESULT_FAILURE;

sample-form-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterDatumService.java

@@ -25,6 +25,7 @@ public interface MatterDatumService extends ICRUDService<MatterDatumEntity, Long
      */
     Rest<String> addPubdatum(Long[] pubIds,Long matterId,Long siteId, Context context);
 
+
     /**
      * 推荐or取消推荐
      *

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

@@ -90,7 +90,7 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
 
     @Override
     protected void saveAfter(MatterDatumEntity entity, Context context) throws AppException {
-        statDatumCount(entity,context);
+        statDatumCount(entity, context);
         addPubdatum(entity, context);
         super.saveAfter(entity, context);
     }
@@ -114,30 +114,28 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
     }
 
 
-
-
     @Override
     public int remove(Long id, Context context) throws AppException {
         this.removeBefore(id, context);
         MatterDatumEntity matterDatumEntity = this.get(id, context);
         int iRet = this.dao.delete(id);
         this.removeAfter(id, context, iRet);
-        statDatumCount(matterDatumEntity,context);
+        statDatumCount(matterDatumEntity, context);
         return iRet;
     }
 
     @Override
     public int remove(Long[] ids, Context context) throws AppException {
         this.removeBefore(ids, context);
-        if(ids==null||ids.length==0) return 0;
+        if (ids == null || ids.length == 0) return 0;
         MatterDatumEntity matterDatumEntity = this.get(ids[0], context);
         int iRet = this.dao.delete(ids);
         this.removeAfter(ids, context, iRet);
-        statDatumCount(matterDatumEntity,context);
+        statDatumCount(matterDatumEntity, context);
         return iRet;
     }
 
-    private void statDatumCount( MatterDatumEntity matterDatumEntity,Context context) {
+    private void statDatumCount(MatterDatumEntity matterDatumEntity, Context context) {
         int count = this.count(new MatterDatumQuery().matterId(matterDatumEntity.getMatterId()), context);
         MatterEntity matterEntity = matterService.get(matterDatumEntity.getMatterId(), context);
         if (!ObjectUtils.isEmpty(matterEntity)) {
@@ -188,8 +186,8 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
                 fail++;
             }
         }
-        if(!ObjectUtils.isEmpty(matterDatumEntities)){
-            this.save(matterDatumEntities,context);
+        if (!ObjectUtils.isEmpty(matterDatumEntities)) {
+            this.save(matterDatumEntities, context);
         }
         String msg = "当前加入材料已存在！";
         if (pubIds.length == 1) {
@@ -208,9 +206,11 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
         return Rest.ok(msg);
     }
 
+
+
     private MatterDatumEntity updateOrSave(PubdatumEntity pubdatumEntity, Long matterId, Long siteId, Context context) {
-        MatterDatumEntity matterDatumEntity = this.selectOne(new MatterDatumQuery().siteId(siteId).matterId(matterId).materialName(pubdatumEntity.getMaterialName()));
-        if (ObjectUtils.isEmpty(matterDatumEntity)) {
+        int count = this.count(new MatterDatumQuery().siteId(siteId).matterId(matterId).materialName(pubdatumEntity.getMaterialName()), context);
+        if (count == 0) {
             MatterDatumEntity entity = new MatterDatumEntity();
             BeanUtils.copyProperties(pubdatumEntity, entity, new String[]{"id", "matterId"});
             entity.setSiteId(siteId);

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

@@ -91,6 +91,8 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
         return ret.toJSONString();
     }
 
+
+
     @RequestMapping(value = {"recommend"}, method = {RequestMethod.POST, RequestMethod.GET})
     public String recommend(Long id, Long siteId) {
         Map<String, Object> model = new HashMap();