fix 评论

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BomanNewsServiceImpl.java

@@ -22,13 +22,12 @@ import com.ruoyi.system.service.IBomanNewsService;
 
 /**
  * boman_newsService业务层处理
- * 
+ *
  * @author boman
  * @date 2023-11-02
  */
 @Service
-public class BomanNewsServiceImpl implements IBomanNewsService 
-{
+public class BomanNewsServiceImpl implements IBomanNewsService {
     @Autowired
     private BomanNewsMapper bomanNewsMapper;
 
@@ -37,75 +36,69 @@ public class BomanNewsServiceImpl implements IBomanNewsService
 
     /**
      * 查询boman_news
-     * 
+     *
      * @param newsId boman_news主键
      * @return boman_news
      */
     @Override
-    public BomanNews selectBomanNewsByNewsId(Long newsId)
-    {
+    public BomanNews selectBomanNewsByNewsId(Long newsId) {
         return bomanNewsMapper.selectBomanNewsByNewsId(newsId);
     }
 
     /**
      * 查询boman_news列表
-     * 
+     *
      * @param bomanNews boman_news
      * @return boman_news
      */
     @Override
-    public List<BomanNews> selectBomanNewsList(BomanNews bomanNews)
-    {
+    public List<BomanNews> selectBomanNewsList(BomanNews bomanNews) {
         return bomanNewsMapper.selectBomanNewsList(bomanNews);
     }
 
     /**
      * 新增boman_news
-     * 
+     *
      * @param bomanNews boman_news
      * @return 结果
      */
     @Override
-    public int insertBomanNews(BomanNews bomanNews)
-    {
+    public int insertBomanNews(BomanNews bomanNews) {
         bomanNews.setCreateTime(DateUtils.getNowDate());
         return bomanNewsMapper.insertBomanNews(bomanNews);
     }
 
     /**
      * 修改boman_news
-     * 
+     *
      * @param bomanNews boman_news
      * @return 结果
      */
     @Override
-    public int updateBomanNews(BomanNews bomanNews)
-    {
+    public int updateBomanNews(BomanNews bomanNews) {
         bomanNews.setUpdateTime(DateUtils.getNowDate());
         return bomanNewsMapper.updateBomanNews(bomanNews);
     }
 
     /**
      * 批量删除boman_news
-     * 
+     *
      * @param newsIds 需要删除的boman_news主键
      * @return 结果
      */
     @Override
-    public int deleteBomanNewsByNewsIds(Long[] newsIds)
-    {
+    public int deleteBomanNewsByNewsIds(Long[] newsIds) {
         return bomanNewsMapper.deleteBomanNewsByNewsIds(newsIds);
     }
 
     /**
      * 删除boman_news信息
-     * 
+     *
      * @param newsId boman_news主键
      * @return 结果
      */
     @Override
-    public int deleteBomanNewsByNewsId(Long newsId)
-    {
+    public int deleteBomanNewsByNewsId(Long newsId) {
         return bomanNewsMapper.deleteBomanNewsByNewsId(newsId);
     }
 
@@ -114,20 +107,20 @@ public class BomanNewsServiceImpl implements IBomanNewsService
      */
     @Override
     public AjaxResult indexStatisticsInFor() {
-        Map<String,Object> map = new HashMap<>();
-        map.put("year",0);
-        map.put("yearMonth",0);
+        Map<String, Object> map = new HashMap<>();
+        map.put("year", 0);
+        map.put("yearMonth", 0);
         JSONArray jsonArray = new JSONArray();
         //查询字典值
         List<SysDictData> dictDataList = dictTypeService.selectDictDataByType("wenzl");
-        if (dictDataList != null && dictDataList.size() > 0){
+        if (dictDataList != null && dictDataList.size() > 0) {
             for (SysDictData sysDictData : dictDataList) {
                 JSONObject jsonObject = new JSONObject();
-                jsonObject.put("id",sysDictData.getDictValue());
-                jsonObject.put("this",0);
-                jsonObject.put("last",0);
-                jsonObject.put("status",0);
-                jsonArray.add(Integer.parseInt(sysDictData.getDictValue()),jsonObject);
+                jsonObject.put("id", sysDictData.getDictValue());
+                jsonObject.put("this", 0);
+                jsonObject.put("last", 0);
+                jsonObject.put("status", 0);
+                jsonArray.add(Integer.parseInt(sysDictData.getDictValue()), jsonObject);
             }
         }
         //查询本月发布的文章数据
@@ -142,35 +135,38 @@ public class BomanNewsServiceImpl implements IBomanNewsService
         bomanNews.setReleaseTime(DateUtils.parseDate(format.format(c.getTime())));
         //todo 上月数据放到redis中
         List<BomanNews> bomanNewsListLast = bomanNewsMapper.selectBomanNewsList(bomanNews);
-        if (bomanNewsList != null && bomanNewsList.size() > 0){
-            map.put("yearMonth",bomanNewsList.size());
+        if (bomanNewsList != null && bomanNewsList.size() > 0) {
+            map.put("yearMonth", bomanNewsList.size());
             //进行数据比对
             Map<String, List<BomanNews>> collect = bomanNewsList.stream().collect(Collectors.groupingBy(BomanNews::getType));
-            if (collect != null && collect.size() > 0){
-                for (String  key: collect.keySet()) {
-                    JSONObject jsonObject = (JSONObject)jsonArray.get(Integer.parseInt(key));
-                    jsonObject.put("this",collect.get(key).size());
+            if (collect != null && collect.size() > 0) {
+                for (String key : collect.keySet()) {
+                    JSONObject jsonObject = (JSONObject) jsonArray.get(Integer.parseInt(key));
+                    jsonObject.put("this", collect.get(key).size());
                 }
             }
-            if (bomanNewsListLast != null && bomanNewsListLast.size() > 0){
+            if (bomanNewsListLast != null && bomanNewsListLast.size() > 0) {
                 //计算上月数据
                 Map<String, List<BomanNews>> collectLast = bomanNewsListLast.stream().collect(Collectors.groupingBy(BomanNews::getType));
-                if (collect != null && collect.size() > 0){
+                if (collect != null && collect.size() > 0) {
                     for (String key : collect.keySet()) {
                         //本月数据
-                        JSONObject jsonObject = (JSONObject)jsonArray.get(Integer.parseInt(key));
-                        int num = (int)jsonObject.get("this");
-                        //上月数据
-                        int numLast = collectLast.get(key).size();
+                        JSONObject jsonObject = (JSONObject) jsonArray.get(Integer.parseInt(key));
+                        int num = (int) jsonObject.get("this");
+                        int numLast = 0;
+                        if (collectLast.get(key) != null && collectLast.get(key).size() > 0) {
+                            //上月数据
+                            numLast = collectLast.get(key).size();
+                        }
                         //计算 x=y=0 x<y=-1 x>y=1
                         int compare = NumberUtils.compare(num, numLast);
-                        jsonObject.put("last",num-numLast);
-                        jsonObject.put("status",compare);
+                        jsonObject.put("last", num - numLast);
+                        jsonObject.put("status", compare);
                     }
                 }
             }
         }
-        map.put("arrayList",jsonArray);
+        map.put("arrayList", jsonArray);
         return AjaxResult.success(map);
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BomanReservatServiceImpl.java

@@ -224,8 +224,8 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
         Map<String, Object> resultMap = new HashMap<>();
 
         resultMap.put("scale" , "50%");
-        resultMap.put("current" , 50);
-        resultMap.put("total" , 100);
+        resultMap.put("current" , 5);
+        resultMap.put("total" , 10);
         return AjaxResult.success(resultMap);
     }