Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/asking/JnbAskTypeController.java

@@ -97,4 +97,18 @@ public class JnbAskTypeController extends BaseController {
     public R remove(@PathVariable String[] ids) {
         return R.ok(jnbQuestionTypeService.deleteJnbQuestionTypeByIds(ids));
     }
+
+    /*
+    * 小程序-查询类型列表
+    *
+    * @author 韩福成
+    * @date 2024/3/4 10:31
+    */
+    @GetMapping("/typeList")
+    public TableDataInfo typeList(JnbQuestionType jnbQuestionType) {
+        startPage();
+        jnbQuestionType.setWhetherShow("Y");
+        List<JnbQuestionType> list = jnbQuestionTypeService.selectJnbQuestionTypeList(jnbQuestionType);
+        return getDataTable(list);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/department/configurationController.java

@@ -0,0 +1,74 @@
+package com.ruoyi.web.controller.department;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import com.sooka.jnb.department.domin.Department;
+import com.sooka.jnb.department.service.DepartmentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 部门配置Controller
+ *
+ * @author ruoyi
+ * @date 2024-03-01
+ */
+@RestController
+@RequestMapping("/system/department")
+public class configurationController extends BaseController
+{
+    @Autowired
+    private DepartmentService departmentService;
+
+    /**
+     * 查询部门配置列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(Department department)
+    {
+        startPage();
+        List<Department> list = departmentService.selectSysDeptVo(department);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取部门配置详细信息
+     */
+    @GetMapping(value = "/lists/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(departmentService.selectSysDeptById(id));
+    }
+
+    /**
+     * 新增部门配置
+     */
+    @PostMapping("add")
+    public AjaxResult add(@RequestBody Department department)
+    {
+        return toAjax(departmentService.insertSysDept(department));
+    }
+
+    /**
+     * 修改部门配置
+     */
+    @PutMapping("update")
+    public AjaxResult edit(@RequestBody Department department)
+    {
+        return toAjax(departmentService.updateSysDept(department));
+    }
+
+    /**
+     * 删除部门配置
+     */
+    @DeleteMapping("/delete/{id}")
+    public AjaxResult remove(@PathVariable Long id)
+    {
+        return toAjax(departmentService.deleteSysDeptByDeptId(id));
+    }
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/handleAffairs/TopicTypeController.java

@@ -41,7 +41,11 @@ public class TopicTypeController extends BaseController {
         List<TopicType> list = topicTypeService.selectTopicTypeList(topicType);
         return getDataTable(list);
     }
-
+    @GetMapping("/listAll")
+    public AjaxResult listAll(TopicType topicType)
+    {
+        return success(topicTypeService.selectTopicTypeList(topicType));
+    }
     /**
      * 导出主题类型配置列表
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/highServer/JnbHighServerController.java

@@ -90,4 +90,40 @@ public class JnbHighServerController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids,@PathVariable("type") Integer type) {
         return toAjax(jnbHighServerService.deleteJnbHighServerByIds(ids,type));
     }
+
+    /**
+     * 小程序获取直播带货列表
+     */
+    @GetMapping("/liveBroadcastList")
+    public TableDataInfo getLiveBroadcast(JnbHighServer jnbHighServer) {
+        startPage();
+        List<JnbHighServerVO> list = jnbHighServerService.getLiveBroadcast(jnbHighServer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 小程序获取直播带货详情
+     */
+    @GetMapping("/liveBroadcastDetails/{id}")
+    public AjaxResult liveBroadcastDetails(@PathVariable Long id) {
+        return success(jnbHighServerService.liveBroadcastDetails(id));
+    }
+
+    /**
+     * 小程序获取生活服务列表
+     */
+    @GetMapping("/lifeServicesList")
+    public TableDataInfo getLifeServices(JnbHighServer jnbHighServer) {
+        startPage();
+        List<JnbHighServerVO> list = jnbHighServerService.getLifeServices(jnbHighServer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 小程序获取生活服务详情
+     */
+    @GetMapping("/lifeServicesDetails/{id}")
+    public AjaxResult lifeServicesDetails(@PathVariable Long id) {
+        return success(jnbHighServerService.lifeServicesDetails(id));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/information/InformationController.java

@@ -3,7 +3,9 @@ package com.ruoyi.web.controller.information;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.github.pagehelper.Page;
 import com.sooka.jnb.information.domain.Information;
+import com.sooka.jnb.information.domain.InformationUni;
 import com.sooka.jnb.information.service.InformationService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,9 +38,27 @@ public class InformationController extends BaseController
     private InformationService informationService;
 
     /**
+     * 点赞
+     */
+    @PostMapping("/like")
+    public AjaxResult like(Information information){
+        return toAjax(informationService.likeById(information));
+    }
+
+
+    /**
+     * 浏览
+     */
+    @PostMapping("/watch")
+    public AjaxResult watchById(Information information){
+        return toAjax(informationService.watchById(information));
+    }
+
+
+    /**
      * 查询资讯列表
      */
-    @PreAuthorize("@ss.hasPermi('jnb:information:list')")
+//    @PreAuthorize("@ss.hasPermi('jnb:information:list')")
     @GetMapping("/list")
     public TableDataInfo list(Information information)
     {
@@ -51,32 +71,29 @@ public class InformationController extends BaseController
     /**
      * 查询前三条-小程序
      */
-    @PreAuthorize("@ss.hasPermi('jnb:information:query')")
+//    @PreAuthorize("@ss.hasPermi('jnb:information:query')")
     @GetMapping("/listWx")
-    public TableDataInfo listWx(Information information)
+    public AjaxResult listWx(Information information)
     {
-        startPage();
         List<Information> list = informationService.selectInformationListWx(information);
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
 
     /**
      * 查询文章列表包括置顶-小程序
      */
-    @PreAuthorize("@ss.hasPermi('jnb:information:query')")
+//    @PreAuthorize("@ss.hasPermi('jnb:information:query')")
     @GetMapping("/listWxs")
-    public TableDataInfo listWxs(Information information)
+    public TableDataInfo listWxs(Information information, Integer pageNum,Integer pageSize)
     {
-        startPage();
-        List<Information> list = informationService.selectInformationListWxs(information);
-        return getDataTable(list);
+        return informationService.selectInformationListWxs(information,pageNum,pageSize);
     }
 
 
     /**
      * 导出资讯列表
      */
-    @PreAuthorize("@ss.hasPermi('jnb:information:export')")
+//    @PreAuthorize("@ss.hasPermi('jnb:information:export')")
     @Log(title = "资讯导出", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, Information information)
@@ -89,39 +106,57 @@ public class InformationController extends BaseController
     /**
      * 获取资讯详细信息
      */
-    @PreAuthorize("@ss.hasPermi('jnb:information:query')")
+//    @PreAuthorize("@ss.hasPermi('jnb:information:query')")
     @GetMapping(value = "/{id}/{type}")
     public AjaxResult getInfo(@PathVariable("id") Long id,@PathVariable("type") Integer type)
     {
         return success(informationService.selectInformationById(id,type));
     }
-
+    /**
+     * 获取资讯详细信息-小程序
+     */
+//    @PreAuthorize("@ss.hasPermi('jnb:information:query')")
+    @GetMapping(value = "/uniApp/{id}/{type}")
+    public AjaxResult getInfoUniApp(@PathVariable("id") Long id,@PathVariable("type") Integer type)
+    {
+        return success(informationService.selectInformationByIdgetInfoUniApp(id,type));
+    }
     /**
      * 新增资讯
      */
-    @PreAuthorize("@ss.hasPermi('jnb:information:add')")
+//    @PreAuthorize("@ss.hasPermi('jnb:information:add')")
     @Log(title = "新增资讯", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Information information)
     {
         return toAjax(informationService.insertInformationServer(information));
     }
-
+    @Log(title = "新增资讯-小程序", businessType = BusinessType.INSERT)
+    @PostMapping("/uniApp")
+    public AjaxResult adduniApp(@RequestBody InformationUni information)
+    {
+        return toAjax(informationService.insertInformationServerUni(information));
+    }
     /**
      * 修改资讯
      */
-    @PreAuthorize("@ss.hasPermi('jnb:information:edit')")
+//    @PreAuthorize("@ss.hasPermi('jnb:information:edit')")
     @Log(title = "修改资讯", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Information information)
     {
         return toAjax(informationService.updateInformation(information));
     }
-
+    @Log(title = "修改资讯", businessType = BusinessType.UPDATE)
+    @PutMapping("/uniApp")
+    public AjaxResult editUniApp(@RequestBody InformationUni information)
+    {
+        return toAjax(informationService.updateInformationUni(information));
+    }
     /**
      * 删除资讯
      */
-    @PreAuthorize("@ss.hasPermi('jnb:information:remove')")
+//    @PreAuthorize("@ss.hasPermi('jnb:information:remove')")
     @Log(title = "删除资讯", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}/{type}")
     public AjaxResult remove(@PathVariable("ids") Long[] ids,@PathVariable("type") Integer type)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/knowledge/JnbKnowledgeBaserController.java

@@ -92,4 +92,14 @@ public class JnbKnowledgeBaserController extends BaseController {
     public AjaxResult updateIsPopular(@RequestBody JnbKnowledgeBaseDTO JnbKnowledgeBaseDTO) {
         return toAjax(jnbKnowledgeBaseService.updateIsPopular(JnbKnowledgeBaseDTO));
     }
+
+    /**
+     * 小程序查询热门知识列表
+     */
+    @GetMapping("/popularKnowledgeList")
+    public TableDataInfo popularKnowledgeList(JnbKnowledgeBaseVO jnbKnowledgeBaseVO) {
+        startPage();
+        List<JnbKnowledgeBaseVO> list = jnbKnowledgeBaseService.popularKnowledgeList(jnbKnowledgeBaseVO);
+        return getDataTable(list);
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/matter/matterConllter.java

@@ -0,0 +1,84 @@
+package com.ruoyi.web.controller.matter;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import com.sooka.jnb.department.domin.Department;
+import com.sooka.jnb.matter.domin.Matter;
+import com.sooka.jnb.matter.service.MatterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+/**
+ * 事项Controller
+ *
+ * @author ruoyi
+ * @date 2024-03-01
+ */
+@RestController
+@RequestMapping("/system/matter")
+public class matterConllter extends BaseController {
+
+    @Autowired
+    private MatterService matterService;
+
+        /**
+         * 查询事项列表
+         */
+        @GetMapping("/list")
+        public TableDataInfo list(Matter matter)
+        {
+            startPage();
+            List<Matter> list = matterService.selectSysMatterVo(matter);
+            return getDataTable(list);
+        }
+
+        /**
+         * 获取事项详细信息
+         */
+        @GetMapping(value = "/lists/{id}")
+        public AjaxResult getInfo(@PathVariable("id") Integer id)
+        {
+            return success(matterService.selectSysMatterById(id));
+        }
+
+        /**
+         * 新增事项
+         */
+        @PostMapping("add")
+        public AjaxResult add(@RequestBody Matter matter)
+        {
+            return toAjax(matterService.insertSysMatter(matter));
+        }
+
+        /**
+         * 修改事项
+         */
+        @PutMapping("update")
+        public AjaxResult edit(@RequestBody Matter matter)
+        {
+            return toAjax(matterService.updateSysMatter(matter));
+        }
+
+        /**
+         * 审核事项
+         */
+        @PutMapping("examine")
+        public AjaxResult examine(@RequestBody Matter matter)
+        {
+            return toAjax(matterService.examine(matter));
+        }
+
+        /**
+         * 删除事项
+         */
+        @DeleteMapping("/delete/{id}")
+        public AjaxResult remove(@PathVariable Long id)
+        {
+            return toAjax(matterService.deleteSysMatterByDeptId(id));
+        }
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/my/AnnouncementController.java

@@ -0,0 +1,96 @@
+package com.ruoyi.web.controller.my;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.sooka.jnb.my.domain.Announcement;
+import com.sooka.jnb.my.domain.AnnouncementRead;
+import com.sooka.jnb.my.service.IAnnouncementService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 公告Controller
+ *
+ * @author LG
+ * @date 2024-03-02
+ */
+@RestController
+@RequestMapping("/my/announcement")
+public class AnnouncementController extends BaseController {
+    @Autowired
+    private IAnnouncementService announcementService;
+
+    /**
+     * 查询公告列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(Announcement announcement) {
+        startPage();
+        List<Announcement> list = announcementService.selectAnnouncementList(announcement);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取公告详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id) {
+        return success(announcementService.selectAnnouncementById(id));
+    }
+
+    /**
+     * 新增公告
+     */
+    @PostMapping
+    public AjaxResult add(@RequestBody Announcement announcement) {
+        return toAjax(announcementService.insertAnnouncement(announcement));
+    }
+
+    /**
+     * 修改公告
+     */
+    @PutMapping
+    public AjaxResult edit(@RequestBody Announcement announcement) {
+        return toAjax(announcementService.updateAnnouncement(announcement));
+    }
+
+    /**
+     * 删除公告
+     */
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
+        return toAjax(announcementService.deleteAnnouncementByIds(ids));
+    }
+
+    /**
+     * 已读消息
+     */
+    @PostMapping("/readAnnouncement")
+    public AjaxResult readAnnouncement(@RequestBody AnnouncementRead announcement) {
+        return toAjax(announcementService.readAnnouncement(announcement));
+    }
+
+    /**
+     * 查询最新消息（滚动）
+     */
+    @GetMapping("/getNewAnnouncement")
+    public AjaxResult getNewAnnouncement(Announcement announcement) {
+        return AjaxResult.success(announcementService.getNewAnnouncement(announcement));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/my/JnbNameAuthenticationController.java

@@ -88,4 +88,16 @@ public class JnbNameAuthenticationController extends BaseController {
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(jnbNameAuthenticationService.deleteJnbNameAuthenticationByIds(ids));
     }
+
+    /*
+    * 小程序-提交实名认证
+    *
+    * @author 韩福成
+    * @date 2024/3/4 14:21
+    */
+    @Log(title = "实名认证", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/appletAdd")
+    public AjaxResult appletAdd(@RequestBody JnbNameAuthentication jnbNameAuthentication) {
+        return toAjax(jnbNameAuthenticationService.insertJnbNameAuthentication(jnbNameAuthentication));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/my/JnbOfficialAuthenticationController.java

@@ -95,4 +95,16 @@ public class JnbOfficialAuthenticationController extends BaseController {
     public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(jnbOfficialAuthenticationService.deleteJnbOfficialAuthenticationByIds(ids));
     }
+
+    /*
+    * 小程序-官方认证提交
+    *
+    * @author 韩福成
+    * @date 2024/3/4 16:24
+    */
+    @Log(title = "官方认证", businessType = BusinessType.INSERT)
+    @PostMapping("/appletAdd")
+    public AjaxResult appletAdd(@RequestBody JnbOfficialAuthentication jnbOfficialAuthentication) {
+        return toAjax(jnbOfficialAuthenticationService.insertJnbOfficialAuthentication(jnbOfficialAuthentication));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/my/ScoreController.java

@@ -90,4 +90,12 @@ public class ScoreController extends BaseController {
             return AjaxResult.error("用户积分不足, 减少积分失败!");
         }
     }
+
+    /**
+     * 验证积分是否充足
+     */
+    @GetMapping("/verifyScore")
+    public AjaxResult verifyScore(ScoreOperate scoreOperate) {
+        return AjaxResult.success(service.verifyScore(scoreOperate));
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/quotations/JnbQuotationsConfigController.java

@@ -38,19 +38,18 @@ public class JnbQuotationsConfigController extends BaseController {
     /**
      * 查询行情产品配置列表
      */
-    @PreAuthorize("@ss.hasPermi('jnb:config:list')")
+//    @PreAuthorize("@ss.hasPermi('jnb:config:list')")
     @GetMapping("/list")
     public TableDataInfo list(JnbQuotationsConfig jnbQuotationsConfig) {
         startPage();
         List<JnbQuotationsConfig> list = jnbQuotationsConfigService.selectJnbQuotationsConfigList(jnbQuotationsConfig);
-        System.out.println(list);
         return getDataTable(list);
     }
 
     /**
      * 获取行情产品配置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('jnb:config:query')")
+//    @PreAuthorize("@ss.hasPermi('jnb:config:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(jnbQuotationsConfigService.selectJnbQuotationsConfigById(id));
@@ -59,7 +58,7 @@ public class JnbQuotationsConfigController extends BaseController {
     /**
      * 新增行情产品配置
      */
-    @PreAuthorize("@ss.hasPermi('jnb:config:add')")
+//    @PreAuthorize("@ss.hasPermi('jnb:config:add')")
     @Log(title = "行情产品配置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody JnbQuotationsConfig jnbQuotationsConfig) {
@@ -74,7 +73,7 @@ public class JnbQuotationsConfigController extends BaseController {
     /**
      * 修改行情产品配置
      */
-    @PreAuthorize("@ss.hasPermi('jnb:config:edit')")
+//    @PreAuthorize("@ss.hasPermi('jnb:config:edit')")
     @Log(title = "行情产品配置", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody JnbQuotationsConfig jnbQuotationsConfig) {
@@ -89,10 +88,10 @@ public class JnbQuotationsConfigController extends BaseController {
     /**
      * 删除行情产品配置
      */
-    @PreAuthorize("@ss.hasPermi('jnb:config:remove')")
+//    @PreAuthorize("@ss.hasPermi('jnb:config:remove')")
     @Log(title = "行情产品配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{id}")
-    public AjaxResult remove(@PathVariable Long id) {
+    public AjaxResult remove(@PathVariable("id") Long id) {
         int i = jnbQuotationsConfigService.deleteJnbQuotationsConfigByIds(id);
         if (i > 0){
             return toAjax(i);
@@ -104,7 +103,7 @@ public class JnbQuotationsConfigController extends BaseController {
     /**
      * 查询树结构
      */
-    @PreAuthorize("@ss.hasPermi('jnb:config:list')")
+//    @PreAuthorize("@ss.hasPermi('jnb:config:list')")
     @Log(title = "行情产品配置")
     @GetMapping("all")
     public AjaxResult all(JnbQuotationsConfig jnbQuotationsConfig) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/quotations/JnbQuotationsController.java

@@ -31,7 +31,7 @@ public class JnbQuotationsController extends BaseController
     /**
      * 查询行情列表
      */
-    @PreAuthorize("@ss.hasPermi('jnb:quotations:list')")
+//    @PreAuthorize("@ss.hasPermi('jnb:quotations:list')")
     @GetMapping("/list")
     public TableDataInfo list(JnbQuotations jnbQuotations)
     {
@@ -43,17 +43,17 @@ public class JnbQuotationsController extends BaseController
     /**
      * 获取行情详细信息
      */
-    @PreAuthorize("@ss.hasPermi('jnb:quotations:query')")
-    @GetMapping(value = "/{id}/{type}")
-    public AjaxResult getInfo(@PathVariable("id") Long id,@PathVariable("type")Integer type)
+//    @PreAuthorize("@ss.hasPermi('jnb:quotations:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(jnbQuotationsService.selectJnbQuotationsById(id,type));
+        return success(jnbQuotationsService.selectJnbQuotationsById(id));
     }
 
     /**
      * 新增行情
      */
-    @PreAuthorize("@ss.hasPermi('jnb:quotations:add')")
+//    @PreAuthorize("@ss.hasPermi('jnb:quotations:add')")
     @Log(title = "行情", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody JnbQuotations jnbQuotations)
@@ -69,7 +69,7 @@ public class JnbQuotationsController extends BaseController
     /**
      * 修改行情
      */
-    @PreAuthorize("@ss.hasPermi('jnb:quotations:edit')")
+//    @PreAuthorize("@ss.hasPermi('jnb:quotations:edit')")
     @Log(title = "行情", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody JnbQuotations jnbQuotations)
@@ -81,11 +81,11 @@ public class JnbQuotationsController extends BaseController
     /**
      * 删除行情
      */
-    @PreAuthorize("@ss.hasPermi('jnb:quotations:remove')")
+//    @PreAuthorize("@ss.hasPermi('jnb:quotations:remove')")
     @Log(title = "行情", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}/{type}")
-    public AjaxResult remove(@PathVariable Long[] ids,@PathVariable("type")Integer type)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable("ids") Long[] ids)
     {
-        return toAjax(jnbQuotationsService.deleteJnbQuotationsByIds(ids,type));
+        return toAjax(jnbQuotationsService.deleteJnbQuotationsByIds(ids));
     }
 }

sooka-jnb/src/main/java/com/sooka/jnb/department/domin/Department.java

@@ -0,0 +1,17 @@
+package com.sooka.jnb.department.domin;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class Department extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    //部门id
+    private Integer id;
+    //部门名称
+    private  String  name;
+    //是否首页展示
+    private  String  shows;
+    //办理对象
+    private  String  application;
+}

sooka-jnb/src/main/java/com/sooka/jnb/department/mapper/DepartmentMapper.java

@@ -0,0 +1,40 @@
+package com.sooka.jnb.department.mapper;
+
+import com.sooka.jnb.department.domin.Department;
+
+import java.util.List;
+
+/**
+ * 部门Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-03-01
+ */
+public interface DepartmentMapper
+{
+
+    /**
+     * 查询部门配置列表
+     */
+    List<Department> selectSysDeptVo(Department department);
+
+    /**
+     * 获取部门配置详细信息
+     */
+    Department selectSysDeptById(Integer id);
+
+    /**
+     * 新增部门配置
+     */
+    int insertSysDept(Department department);
+
+    /**
+     * 修改部门配置
+     */
+    int updateSysDept(Department department);
+
+    /**
+     * 删除部门配置
+     */
+    int deleteSysDeptByDeptId(Long id);
+}

sooka-jnb/src/main/java/com/sooka/jnb/department/service/DepartmentService.java

@@ -0,0 +1,35 @@
+package com.sooka.jnb.department.service;
+
+import com.sooka.jnb.department.domin.Department;
+
+import java.util.List;
+
+public interface DepartmentService
+{
+
+
+    /**
+     * 查询部门配置列表
+     */
+     List<Department> selectSysDeptVo(Department department);
+
+    /**
+     * 获取部门配置详细信息
+     */
+    Department selectSysDeptById(Integer id);
+
+    /**
+     * 新增部门配置
+     */
+     int insertSysDept(Department department);
+
+    /**
+     * 修改部门配置
+     */
+     int updateSysDept(Department department);
+
+    /**
+     * 删除部门配置
+     */
+     int deleteSysDeptByDeptId(Long id);
+}

sooka-jnb/src/main/java/com/sooka/jnb/department/service/impl/departmentServicempl.java

@@ -0,0 +1,64 @@
+package com.sooka.jnb.department.service.impl;
+
+import com.sooka.jnb.department.domin.Department;
+import com.sooka.jnb.department.service.DepartmentService;
+import org.springframework.stereotype.Service;
+import com.sooka.jnb.department.mapper.DepartmentMapper;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class departmentServicempl implements DepartmentService
+{
+    @Resource
+    private DepartmentMapper departmentMapper;
+
+
+
+    /**
+     * 查询部门配置列表
+     */
+    @Override
+    public List<Department> selectSysDeptVo(Department department)
+    {
+        return departmentMapper.selectSysDeptVo(department);
+    }
+
+    /**
+     * 获取部门配置详细信息
+     */
+    @Override
+    public  Department selectSysDeptById(Integer id)
+    {
+        return departmentMapper.selectSysDeptById(id);
+    }
+
+    /**
+     * 新增部门配置
+     */
+    @Override
+    public int insertSysDept(Department department)
+    {
+
+        return departmentMapper.insertSysDept(department);
+    }
+
+    /**
+     * 修改部门配置
+     */
+    @Override
+    public int updateSysDept(Department department)
+    {
+        return departmentMapper.updateSysDept(department);
+    }
+
+    /**
+     * 删除部门配置
+     */
+    @Override
+    public int deleteSysDeptByDeptId(Long id)
+    {
+        return departmentMapper.deleteSysDeptByDeptId(id);
+    }
+}

sooka-jnb/src/main/java/com/sooka/jnb/handleAffairs/domain/TopicType.java

@@ -7,6 +7,8 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * 主题类型配置对象 jnb_topic_type
@@ -33,7 +35,9 @@ public class TopicType extends BaseEntity
 
     /** 办理对象（字典值：个人or法人） */
     @Excel(name = "办理对象", readConverterExp = "字=典值：个人or法人",dictType = "object_application")
-    @NotBlank(message = "办理对象不能为空")
     private String objectOfHandling;
 
+    @NotEmpty(message = "办理对象不能为空")
+    private List<String> objectOfHandlingArray;
+
 }

sooka-jnb/src/main/java/com/sooka/jnb/handleAffairs/service/impl/TopicTypeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sooka.jnb.handleAffairs.service.impl;
 
+import java.util.Arrays;
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
@@ -29,8 +30,9 @@ public class TopicTypeServiceImpl implements ITopicTypeService
      */
     @Override
     public TopicType selectTopicTypeById(Long id)
-    {
-        return topicTypeMapper.selectTopicTypeById(id);
+    {   TopicType topicType = topicTypeMapper.selectTopicTypeById(id);
+        topicType.setObjectOfHandlingArray(Arrays.asList(topicType.getObjectOfHandling().split(",")));
+        return topicType;
     }
 
     /**
@@ -42,7 +44,11 @@ public class TopicTypeServiceImpl implements ITopicTypeService
     @Override
     public List<TopicType> selectTopicTypeList(TopicType topicType)
     {
-        return topicTypeMapper.selectTopicTypeList(topicType);
+        List<TopicType> list = topicTypeMapper.selectTopicTypeList(topicType);
+        list.forEach(e->{
+            e.setObjectOfHandlingArray(Arrays.asList(e.getObjectOfHandling().split(",")));
+        });
+        return list;
     }
 
     /**
@@ -57,6 +63,7 @@ public class TopicTypeServiceImpl implements ITopicTypeService
         topicType.setCreateTime(DateUtils.getNowDate());
         topicType.setCreateBy(SecurityUtils.getUserId().toString());
         topicType.setDelFlag("0");
+        topicType.setObjectOfHandling(String.join(",",topicType.getObjectOfHandlingArray()));
         return topicTypeMapper.insertTopicType(topicType);
     }
 
@@ -71,6 +78,7 @@ public class TopicTypeServiceImpl implements ITopicTypeService
     {
         topicType.setUpdateTime(DateUtils.getNowDate());
         topicType.setUpdateBy(SecurityUtils.getUserId().toString());
+        topicType.setObjectOfHandling(String.join(",",topicType.getObjectOfHandlingArray()));
         return topicTypeMapper.updateTopicType(topicType);
     }
 

sooka-jnb/src/main/java/com/sooka/jnb/highServer/mapper/JnbHighServerImgMapper.java

@@ -15,4 +15,6 @@ public interface JnbHighServerImgMapper {
     int saveJnbHighServerImg(List<JnbHighServerImg> saveList);
 
     String selectAll(@Param("serverId") Long serverId, @Param("type")  Integer type);
+
+    List<String> selectAllList(@Param("serverId") Long serverId, @Param("type")  Integer type);
 }

sooka-jnb/src/main/java/com/sooka/jnb/highServer/mapper/JnbHighServerMapper.java

@@ -60,4 +60,12 @@ public interface JnbHighServerMapper {
      * @return 结果
      */
     public int deleteJnbHighServerByIds(@Param("ids") Long[] ids, @Param("type")  Integer type);
+
+    List<JnbHighServerVO> getLiveBroadcast(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO liveBroadcastDetails(Long id);
+
+    List<JnbHighServerVO> getLifeServices(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO lifeServicesDetails(Long id);
 }

sooka-jnb/src/main/java/com/sooka/jnb/highServer/service/IJnbHighServerService.java

@@ -59,4 +59,12 @@ public interface IJnbHighServerService {
      * @return 结果
      */
     public int deleteJnbHighServerById(Long id,Integer type);
+
+    List<JnbHighServerVO> getLiveBroadcast(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO liveBroadcastDetails(Long id);
+
+    List<JnbHighServerVO> getLifeServices(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO lifeServicesDetails(Long id);
 }

sooka-jnb/src/main/java/com/sooka/jnb/highServer/service/impl/JnbHighServerServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.sooka.jnb.highServer.domain.JnbHighServer;
 import com.sooka.jnb.highServer.domain.JnbHighServerImg;
@@ -38,8 +39,8 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
      * @return 高频服务
      */
     @Override
-    public JnbHighServerVO selectJnbHighServerById(Long id,Integer type) {
-        return jnbHighServerMapper.selectJnbHighServerById(id,type);
+    public JnbHighServerVO selectJnbHighServerById(Long id, Integer type) {
+        return jnbHighServerMapper.selectJnbHighServerById(id, type);
     }
 
     /**
@@ -62,6 +63,7 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertJnbHighServer(JnbHighServerVO jnbHighServerVO) {
+        jnbHighServerVO.setCreateBy(SecurityUtils.getUsername());
         jnbHighServerVO.setCreateTime(DateUtils.getNowDate());
         jnbHighServerMapper.insertJnbHighServer(jnbHighServerVO);
         if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
@@ -88,10 +90,11 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int updateJnbHighServer(JnbHighServerVO jnbHighServerVO) {
+        jnbHighServerVO.setUpdateBy(SecurityUtils.getUsername());
         jnbHighServerVO.setUpdateTime(DateUtils.getNowDate());
         jnbHighServerMapper.updateJnbHighServer(jnbHighServerVO);
         if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
-            jnbHighServerImgMapper.deleteJnbHighServerByServerId(jnbHighServerVO.getId(),jnbHighServerVO.getType());
+            jnbHighServerImgMapper.deleteJnbHighServerByServerId(jnbHighServerVO.getId(), jnbHighServerVO.getType());
             List<String> imgUrlArray = Arrays.asList(jnbHighServerVO.getImgUrlList().split(","));
             List<JnbHighServerImg> saveList = new ArrayList<>();
             for (int i = 0; i < imgUrlArray.size(); i++) {
@@ -114,9 +117,9 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteJnbHighServerByIds(Long[] ids,Integer type) {
-        jnbHighServerImgMapper.deleteJnbHighServerByServerIds(ids,type);
-        return jnbHighServerMapper.deleteJnbHighServerByIds(ids,type);
+    public int deleteJnbHighServerByIds(Long[] ids, Integer type) {
+        jnbHighServerImgMapper.deleteJnbHighServerByServerIds(ids, type);
+        return jnbHighServerMapper.deleteJnbHighServerByIds(ids, type);
     }
 
     /**
@@ -126,7 +129,47 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
      * @return 结果
      */
     @Override
-    public int deleteJnbHighServerById(Long id,Integer type) {
-        return jnbHighServerMapper.deleteJnbHighServerById(id,type);
+    public int deleteJnbHighServerById(Long id, Integer type) {
+        return jnbHighServerMapper.deleteJnbHighServerById(id, type);
+    }
+
+    @Override
+    public List<JnbHighServerVO> getLiveBroadcast(JnbHighServer jnbHighServer) {
+        List<JnbHighServerVO> list = jnbHighServerMapper.getLiveBroadcast(jnbHighServer);
+        for (JnbHighServerVO var : list) {
+            if (StringUtils.isNotEmpty(var.getImgUrlList())) {
+                var.setPictureList(Arrays.asList(var.getImgUrlList().split(",")));
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public JnbHighServerVO liveBroadcastDetails(Long id) {
+        JnbHighServerVO jnbHighServerVO = jnbHighServerMapper.liveBroadcastDetails(id);
+        if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
+            jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
+        }
+        return jnbHighServerVO;
+    }
+
+    @Override
+    public List<JnbHighServerVO> getLifeServices(JnbHighServer jnbHighServer) {
+        List<JnbHighServerVO> list = jnbHighServerMapper.getLifeServices(jnbHighServer);
+        for (JnbHighServerVO var : list) {
+            if (StringUtils.isNotEmpty(var.getImgUrlList())) {
+                var.setPictureList(Arrays.asList(var.getImgUrlList().split(",")));
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public JnbHighServerVO lifeServicesDetails(Long id) {
+        JnbHighServerVO jnbHighServerVO = jnbHighServerMapper.lifeServicesDetails(id);
+        if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
+            jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
+        }
+        return jnbHighServerVO;
     }
 }

sooka-jnb/src/main/java/com/sooka/jnb/highServer/vo/JnbHighServerVO.java

@@ -91,4 +91,9 @@ public class JnbHighServerVO {
      */
      private String imgUrlList;
 
+     /**
+     * 高频服务图片路径集合
+     */
+     private List<String> pictureList;
+
 }

sooka-jnb/src/main/java/com/sooka/jnb/information/domain/Information.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 import javax.validation.constraints.NotBlank;
+import java.util.List;
 
 /**
  * 资讯
@@ -52,5 +53,17 @@ public class Information extends BaseEntity
     private Integer type;
 
     @TableField(exist = false)
+    private String flag;
+
+    @TableField(exist = false)
+    private List<String> urls;
+
+    @TableField(exist = false)
     private String imgUrlList;
+
+    @TableField(exist = false)
+    private String nickName;
+
+    @TableField(exist = false)
+    private String headImg;
 }

sooka-jnb/src/main/java/com/sooka/jnb/information/domain/InformationUni.java

@@ -0,0 +1,56 @@
+package com.sooka.jnb.information.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * 资讯
+ * 
+ * @author ruoyi
+ * @date 2024-03-01
+ */
+@Data
+public class InformationUni extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    @NotBlank(message = "标题不能为空")
+    private String titleName;
+
+    /** 正文 */
+    @Excel(name = "正文",width = 100)
+    @NotBlank(message = "正文不能为空")
+    private String textDetails;
+
+    /** 是否政策推荐 */
+    @Excel(name = "是否政策推荐", readConverterExp = "1=是,0=否")
+    private Integer isGovernment;
+
+    /** 是否置顶 */
+    @Excel(name = "是否置顶", readConverterExp = "1=是,0=否")
+    private Integer isTop;
+
+    /** 点赞数 */
+    @Excel(name = "点赞数")
+    private Long likeNum;
+
+    /** 浏览数 */
+    @Excel(name = "浏览数")
+    private Long watchNum;
+
+    private Integer type;
+
+    @TableField(exist = false)
+    private List<String> urls;
+
+}

sooka-jnb/src/main/java/com/sooka/jnb/information/mapper/InformationMapper.java

@@ -1,5 +1,6 @@
 package com.sooka.jnb.information.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sooka.jnb.information.domain.Information;
 import org.apache.ibatis.annotations.Param;
 
@@ -66,7 +67,7 @@ public interface InformationMapper
      * @param information 按照时间，点赞，浏览 排序
      * @return 结果
      */
-    List<Information> selectInformationListWxs(Information information);
+    List<Information> selectInformationListWxs(@Param("obj") Information information, @Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
 
     /**
      * 置顶，政策推荐 3个
@@ -74,4 +75,7 @@ public interface InformationMapper
      * @return 结果
      */
     List<Information> selectInformationListWx(Information information);
+
+    int updateInformationLike(Information information);
+    int updateInformationWatch(Information information);
 }

sooka-jnb/src/main/java/com/sooka/jnb/information/service/InformationService.java

@@ -1,6 +1,9 @@
 package com.sooka.jnb.information.service;
 
+import com.github.pagehelper.Page;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.sooka.jnb.information.domain.Information;
+import com.sooka.jnb.information.domain.InformationUni;
 
 import java.util.List;
 
@@ -20,6 +23,7 @@ public interface InformationService
      * @return 资讯
      */
     public Information selectInformationById(Long id,Integer type);
+    public Information selectInformationByIdgetInfoUniApp(Long id,Integer type);
 
     /**
      * 查询资讯服务列表
@@ -39,6 +43,13 @@ public interface InformationService
      * @return 结果
      */
     public int insertInformationServer(Information information);
+    /**
+     * 新增资讯-小程序
+     *
+     * @param information 资讯
+     * @return 结果
+     */
+    public int insertInformationServerUni(InformationUni information);
 
     /**
      * 修改资讯
@@ -47,6 +58,13 @@ public interface InformationService
      * @return 结果
      */
     public int updateInformation(Information information);
+    /**
+     * 修改资讯-小程序
+     *
+     * @param information 资讯
+     * @return 结果
+     */
+    public int updateInformationUni(InformationUni information);
 
     /**
      * 批量删除资讯
@@ -56,5 +74,8 @@ public interface InformationService
      */
     public int deleteInformationByIds(Long[] ids,Integer type);
 
-    List<Information> selectInformationListWxs(Information information);
+    TableDataInfo selectInformationListWxs(Information information, Integer pageNum, Integer pageSize);
+
+    int likeById(Information information);
+    int watchById(Information information);
 }

sooka-jnb/src/main/java/com/sooka/jnb/information/service/impl/InformationServiceImpl.java

@@ -3,12 +3,16 @@ package com.sooka.jnb.information.service.impl;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import com.github.pagehelper.Page;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.sooka.jnb.highServer.domain.JnbHighServerImg;
 import com.sooka.jnb.highServer.mapper.JnbHighServerImgMapper;
 import com.sooka.jnb.information.domain.Information;
+import com.sooka.jnb.information.domain.InformationUni;
 import com.sooka.jnb.information.mapper.InformationMapper;
 import com.sooka.jnb.information.service.InformationService;
 import org.springframework.beans.BeanUtils;
@@ -38,7 +42,15 @@ public class InformationServiceImpl implements InformationService
         information.setImgUrlList(jnbHighServerImgMapper.selectAll(id,information.getType()));
         return information;
     }
-
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Information selectInformationByIdgetInfoUniApp(Long id,Integer type)
+    {
+        Information information = informationMapper.selectInformationById(id,type);
+        information.setUrls(jnbHighServerImgMapper.selectAllList(id,information.getType()));
+        informationMapper.updateInformationWatch(information);
+        return information;
+    }
 
     @Override
     public List<Information> selectInformationList(Information information)
@@ -52,9 +64,28 @@ public class InformationServiceImpl implements InformationService
         return informationMapper.selectInformationListWx(information);
     }
     @Override
-    public List<Information> selectInformationListWxs(Information information)
+    public TableDataInfo selectInformationListWxs(Information information, Integer pageNum, Integer pageSize)
     {
-        return informationMapper.selectInformationListWx(information);
+//        List<Information> result = informationMapper.selectInformationListWxs(information,pageNum, pageSize);
+        List<Information> toolForAbsenteeism = informationMapper.selectInformationListWxs(information,pageNum, pageSize);
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setRows(toolForAbsenteeism.stream() .skip((long) (pageNum - 1) * pageSize)
+                .limit(pageSize)
+                .collect(Collectors.toList()));
+        tableDataInfo.setTotal(toolForAbsenteeism.size());
+        tableDataInfo.setCode(200);
+        tableDataInfo.setMsg("查询成功");
+        return tableDataInfo;
+    }
+
+    @Override
+    public int likeById(Information information) {
+       return informationMapper.updateInformationLike(information);
+    }
+
+    @Override
+    public int watchById(Information information) {
+       return informationMapper.updateInformationWatch(information);
     }
 
 
@@ -66,8 +97,8 @@ public class InformationServiceImpl implements InformationService
         entity.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
         int i = informationMapper.insertInformation(entity);
         if (i>0){
-            List<String> imgUrlList = Arrays.asList(entity.getImgUrlList().split(","));
-            if (!ObjectUtils.isEmpty(imgUrlList)){
+            if (!ObjectUtils.isEmpty(entity.getImgUrlList())){
+                List<String> imgUrlList = Arrays.asList(entity.getImgUrlList().split(","));
                 List<JnbHighServerImg> imgList = new ArrayList<>();
                 imgUrlList.forEach(a->{
                     JnbHighServerImg serverImg = new JnbHighServerImg();
@@ -87,13 +118,41 @@ public class InformationServiceImpl implements InformationService
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public int insertInformationServerUni(InformationUni entity)
+    {
+        entity.setCreateTime(DateUtils.getNowDate());
+        entity.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
+        Information obj = new Information();
+        BeanUtils.copyProperties(entity,obj);
+        int i = informationMapper.insertInformation(obj);
+        if (i>0){
+            if (!ObjectUtils.isEmpty(entity.getUrls())){
+                List<JnbHighServerImg> imgList = new ArrayList<>();
+                entity.getUrls().forEach(a->{
+                    JnbHighServerImg serverImg = new JnbHighServerImg();
+                    serverImg.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
+                    serverImg.setCreateTime(DateUtils.getNowDate());
+                    serverImg.setServerId(entity.getId());
+                    serverImg.setImgUrl(a);
+                    serverImg.setType(entity.getType());
+                    imgList.add(serverImg);
+                });
+                jnbHighServerImgMapper.saveJnbHighServerImg(imgList);
+            }
+        }
+        return i;
+    }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public int updateInformation(Information entity)
     {
         entity.setUpdateTime(DateUtils.getNowDate());
         entity.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         int i = informationMapper.updateInformation(entity);
-        List<String> imgUrlList = Arrays.asList(entity.getImgUrlList().split(","));
-            if (!ObjectUtils.isEmpty(imgUrlList)){
+        if (!ObjectUtils.isEmpty(entity.getImgUrlList())){
+            List<String> imgUrlList = Arrays.asList(entity.getImgUrlList().split(","));
                 List<JnbHighServerImg> imgList = new ArrayList<>();
                 jnbHighServerImgMapper.deleteJnbHighServerByServerId(entity.getId(),entity.getType());
                 imgUrlList.forEach(a->{
@@ -110,6 +169,31 @@ public class InformationServiceImpl implements InformationService
         return i;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateInformationUni(InformationUni entity)
+    {
+        entity.setUpdateTime(DateUtils.getNowDate());
+        entity.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
+        Information obj = new Information();
+        BeanUtils.copyProperties(entity,obj);
+        int i = informationMapper.updateInformation(obj);
+        if (!ObjectUtils.isEmpty(entity.getUrls())){
+            List<JnbHighServerImg> imgList = new ArrayList<>();
+            jnbHighServerImgMapper.deleteJnbHighServerByServerId(entity.getId(),entity.getType());
+            entity.getUrls().forEach(a->{
+                JnbHighServerImg serverImg = new JnbHighServerImg();
+                serverImg.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
+                serverImg.setCreateTime(DateUtils.getNowDate());
+                serverImg.setServerId(entity.getId());
+                serverImg.setImgUrl(a);
+                serverImg.setType(entity.getType());
+                imgList.add(serverImg);
+            });
+            jnbHighServerImgMapper.saveJnbHighServerImg(imgList);
+        }
+        return i;
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)

sooka-jnb/src/main/java/com/sooka/jnb/knowledge/domain/JnbKnowledgeBase.java

@@ -55,6 +55,11 @@ public class JnbKnowledgeBase extends BaseEntity {
     @Excel(name = "浏览数")
     private Long watchNum;
 
+    /**
+     * 创建人id
+     */
+    @Excel(name = "创建人id")
+    private Long createId;
 
     public void setId(Long id) {
         this.id = id;
@@ -112,6 +117,13 @@ public class JnbKnowledgeBase extends BaseEntity {
         return watchNum;
     }
 
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
 
     @Override
     public String toString() {
@@ -128,6 +140,7 @@ public class JnbKnowledgeBase extends BaseEntity {
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
                 .append("delFlag", getDelFlag())
+                .append("createId", getCreateId())
                 .toString();
     }
 }

sooka-jnb/src/main/java/com/sooka/jnb/knowledge/mapper/JnbKnowledgeBaseMapper.java

@@ -63,4 +63,6 @@ public interface JnbKnowledgeBaseMapper {
     public int deleteJnbKnowledgeBaseByIds(Long[] ids);
 
     int updateIsPopular(JnbKnowledgeBaseDTO jnbKnowledgeBaseDTO);
+
+    List<JnbKnowledgeBaseVO> popularKnowledgeList(JnbKnowledgeBaseVO jnbKnowledgeBaseVO);
 }

sooka-jnb/src/main/java/com/sooka/jnb/knowledge/service/IJnbKnowledgeBaseService.java

@@ -62,4 +62,6 @@ public interface IJnbKnowledgeBaseService {
     public int deleteJnbKnowledgeBaseById(Long id);
 
     int updateIsPopular(JnbKnowledgeBaseDTO jnbKnowledgeBaseDTO);
+
+    List<JnbKnowledgeBaseVO> popularKnowledgeList(JnbKnowledgeBaseVO jnbKnowledgeBaseVO);
 }

sooka-jnb/src/main/java/com/sooka/jnb/knowledge/service/impl/JnbKnowledgeBaseServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.sooka.jnb.highServer.domain.JnbHighServerImg;
 import com.sooka.jnb.knowledge.domain.JnbKnowledgeBaseImg;
@@ -61,6 +62,7 @@ public class JnbKnowledgeBaseServiceImpl implements IJnbKnowledgeBaseService {
     @Transactional(rollbackFor = Exception.class)
     public int insertJnbKnowledgeBase(JnbKnowledgeBaseVO jnbKnowledgeBaseVO) {
         jnbKnowledgeBaseVO.setPopular(false);
+        jnbKnowledgeBaseVO.setCreateId(SecurityUtils.getUserId());
         jnbKnowledgeBaseVO.setCreateTime(DateUtils.getNowDate());
         jnbKnowledgeBaseMapper.insertJnbKnowledgeBase(jnbKnowledgeBaseVO);
         if (StringUtils.isNotEmpty(jnbKnowledgeBaseVO.getImgUrlList())) {
@@ -86,6 +88,7 @@ public class JnbKnowledgeBaseServiceImpl implements IJnbKnowledgeBaseService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int updateJnbKnowledgeBase(JnbKnowledgeBaseVO jnbKnowledgeBaseVO) {
+        jnbKnowledgeBaseVO.setUpdateBy(SecurityUtils.getUsername());
         jnbKnowledgeBaseVO.setUpdateTime(DateUtils.getNowDate());
         jnbKnowledgeBaseMapper.updateJnbKnowledgeBase(jnbKnowledgeBaseVO);
         if (StringUtils.isNotEmpty(jnbKnowledgeBaseVO.getImgUrlList())) {
@@ -131,4 +134,9 @@ public class JnbKnowledgeBaseServiceImpl implements IJnbKnowledgeBaseService {
     public int updateIsPopular(JnbKnowledgeBaseDTO jnbKnowledgeBaseDTO) {
         return jnbKnowledgeBaseMapper.updateIsPopular(jnbKnowledgeBaseDTO);
     }
+
+    @Override
+    public List<JnbKnowledgeBaseVO> popularKnowledgeList(JnbKnowledgeBaseVO jnbKnowledgeBaseVO) {
+        return jnbKnowledgeBaseMapper.popularKnowledgeList(jnbKnowledgeBaseVO);
+    }
 }

sooka-jnb/src/main/java/com/sooka/jnb/knowledge/vo/JnbKnowledgeBaseVO.java

@@ -89,4 +89,10 @@ public class JnbKnowledgeBaseVO {
      * 知识库图片路径
      */
     private String imgUrlList;
+
+    /**
+     * 创建人id
+     */
+    @Excel(name = "创建人id")
+    private Long createId;
 }

sooka-jnb/src/main/java/com/sooka/jnb/matter/domin/Matter.java

@@ -0,0 +1,31 @@
+package com.sooka.jnb.matter.domin;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+@Data
+public class Matter extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+        //事项列表id
+        private Integer id;
+        //事项标题
+        private  String  title;
+        //主题类型
+        private  String  type;
+        //所属部门
+        private  String  department;
+        //是否常办
+        private Integer operation;
+        //地址
+        private  String  address;
+        //电话
+        private  String  phone;
+        //图片
+        private  String  picture;
+         //审核状态
+        private  String examine;
+        //内容
+        private  String content;
+    }
+
+

sooka-jnb/src/main/java/com/sooka/jnb/matter/mapper/MatterMapper.java

@@ -0,0 +1,46 @@
+package com.sooka.jnb.matter.mapper;
+
+import com.sooka.jnb.department.domin.Department;
+import com.sooka.jnb.matter.domin.Matter;
+
+import java.util.List;
+/**
+ * 部门Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-03-01
+ */
+public interface MatterMapper {
+
+        /**
+         * 获取事项详细信息
+         */
+        Matter selectSysMatterById(Integer id);
+
+        /**
+         * 查询事项列表
+         */
+        List<Matter> selectSysMatterVo(Matter matter);
+
+        /**
+         * 新增事项
+         */
+        int insertSysMatter(Matter matter);
+
+        /**
+         * 修改事项
+         */
+        int updateSysMatter(Matter matter);
+
+        /**
+         * 审核事项
+         */
+        int examine(Matter matter);
+
+        /**
+         * 删除事项
+         */
+        int deleteSysMatterByDeptId(Long id);
+}
+
+

sooka-jnb/src/main/java/com/sooka/jnb/matter/service/MatterService.java

@@ -0,0 +1,40 @@
+package com.sooka.jnb.matter.service;
+
+
+import com.sooka.jnb.department.domin.Department;
+import com.sooka.jnb.matter.domin.Matter;
+
+import java.util.List;
+
+public interface MatterService
+{
+    /**
+     * 获取事项详细信息
+     */
+    Matter selectSysMatterById(Integer id);
+
+    /**
+     * 查询事项列表
+     */
+     List<Matter> selectSysMatterVo(Matter matter);
+
+    /**
+     * 新增事项
+     */
+    int insertSysMatter(Matter matter);
+
+    /**
+     * 修改事项
+     */
+     int updateSysMatter(Matter matter);
+
+    /**
+     * 审核事项
+     */
+    public int examine(Matter matter);
+
+    /**
+     * 删除事项
+     */
+    int deleteSysMatterByDeptId(Long id);
+}

sooka-jnb/src/main/java/com/sooka/jnb/matter/service/impl/MatterServicempl.java

@@ -0,0 +1,74 @@
+package com.sooka.jnb.matter.service.impl;
+
+
+import com.sooka.jnb.department.domin.Department;
+import com.sooka.jnb.matter.domin.Matter;
+import com.sooka.jnb.matter.mapper.MatterMapper;
+import com.sooka.jnb.matter.service.MatterService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class MatterServicempl implements MatterService
+{
+    @Resource
+    private MatterMapper matterMapper;
+
+    /**
+     * 获取事项详细信息
+     */
+    @Override
+    public Matter selectSysMatterById(Integer id)
+    {
+        return matterMapper.selectSysMatterById(id);
+    }
+
+    /**
+     * 查询事项列表
+     */
+    @Override
+    public List<Matter> selectSysMatterVo(Matter matter)
+    {
+        return matterMapper.selectSysMatterVo(matter);
+    }
+
+    /**
+     * 新增事项
+     */
+    @Override
+    public int insertSysMatter(Matter matter)
+    {
+
+        return matterMapper.insertSysMatter(matter);
+    }
+
+    /**
+     * 修改事项
+     */
+    @Override
+    public int updateSysMatter(Matter matter)
+    {
+        return matterMapper.updateSysMatter(matter);
+    }
+
+    /**
+     * 审核事项
+     */
+    @Override
+    public int examine(Matter matter)
+    {
+        return matterMapper.examine(matter);
+    }
+
+    /**
+     * 删除事项
+     */
+    @Override
+    public int deleteSysMatterByDeptId(Long id)
+    {
+        return matterMapper.deleteSysMatterByDeptId(id);
+    }
+}

sooka-jnb/src/main/java/com/sooka/jnb/my/domain/Announcement.java

@@ -0,0 +1,77 @@
+package com.sooka.jnb.my.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.ibatis.type.Alias;
+
+import java.util.Date;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Alias("announcement")
+public class Announcement extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /** 数据id */
+    private String id;
+
+    /** 公告标题 */
+    private String announcementTitle;
+
+    /** 公告内容 */
+    private String announcementBody;
+
+    /** 公告有效期开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date validityStartTime;
+
+    /** 公告有效期结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date validityEndTime;
+
+    /** 公告图片 */
+    private String announcementImg;
+
+    /** 所属人员id（系统公告此项为null） */
+    private String userId;
+
+    /** 消息状态（1：已读；0：未读） */
+    private String readType;
+
+    public Announcement() {
+    }
+
+    public Announcement(String announcementTitle, String announcementBody, Date validityStartTime, Date validatyEndTime) {
+        this.announcementTitle = announcementTitle;
+        this.announcementBody = announcementBody;
+        this.validityStartTime = validityStartTime;
+        this.validityEndTime = validatyEndTime;
+    }
+
+    public Announcement(String announcementTitle, String announcementBody, String userId) {
+        this.announcementTitle = announcementTitle;
+        this.announcementBody = announcementBody;
+        this.userId = userId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("announcementTitle", getAnnouncementTitle())
+                .append("announcementBody", getAnnouncementBody())
+                .append("validityStartTime", getValidityStartTime())
+                .append("validityEndTime", getValidityEndTime())
+                .append("announcementImg", getAnnouncementImg())
+                .append("userId", getUserId())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

sooka-jnb/src/main/java/com/sooka/jnb/my/domain/AnnouncementRead.java

@@ -0,0 +1,17 @@
+package com.sooka.jnb.my.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.ibatis.type.Alias;
+
+import java.util.Date;
+
+@Data
+@Alias("announcementRead")
+public class AnnouncementRead {
+    private String id;
+    private String userId;
+    private String annoId;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+}

sooka-jnb/src/main/java/com/sooka/jnb/my/mapper/AnnouncementMapper.java

@@ -0,0 +1,66 @@
+package com.sooka.jnb.my.mapper;
+
+import com.sooka.jnb.my.domain.Announcement;
+import com.sooka.jnb.my.domain.AnnouncementRead;
+
+import java.util.List;
+
+/**
+ * 公告Mapper接口
+ *
+ * @author LG
+ * @date 2024-03-02
+ */
+public interface AnnouncementMapper {
+    /**
+     * 查询公告
+     *
+     * @param id 公告主键
+     * @return 公告
+     */
+    public Announcement selectAnnouncementById(String id);
+
+    /**
+     * 查询公告列表
+     *
+     * @param announcement 公告
+     * @return 公告集合
+     */
+    public List<Announcement> selectAnnouncementList(Announcement announcement);
+
+    /**
+     * 新增公告
+     *
+     * @param announcement 公告
+     * @return 结果
+     */
+    public int insertAnnouncement(Announcement announcement);
+
+    /**
+     * 修改公告
+     *
+     * @param announcement 公告
+     * @return 结果
+     */
+    public int updateAnnouncement(Announcement announcement);
+
+    /**
+     * 删除公告
+     *
+     * @param id 公告主键
+     * @return 结果
+     */
+    public int deleteAnnouncementById(String id);
+
+    /**
+     * 批量删除公告
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteAnnouncementByIds(String[] ids);
+
+    int readAnnouncement(AnnouncementRead announcement);
+
+    List<Announcement> getNewAnnouncement(Announcement announcement);
+}

sooka-jnb/src/main/java/com/sooka/jnb/my/service/IAnnouncementService.java

@@ -0,0 +1,72 @@
+package com.sooka.jnb.my.service;
+
+import com.sooka.jnb.my.domain.Announcement;
+import com.sooka.jnb.my.domain.AnnouncementRead;
+
+import java.util.List;
+
+/**
+ * 公告Service接口
+ *
+ * @author LG
+ * @date 2024-03-02
+ */
+public interface IAnnouncementService {
+    /**
+     * 查询公告
+     *
+     * @param id 公告主键
+     * @return 公告
+     */
+    Announcement selectAnnouncementById(String id);
+
+    /**
+     * 查询公告列表
+     *
+     * @param announcement 公告
+     * @return 公告集合
+     */
+    List<Announcement> selectAnnouncementList(Announcement announcement);
+
+    /**
+     * 新增公告
+     *
+     * @param announcement 公告
+     * @return 结果
+     */
+    int insertAnnouncement(Announcement announcement);
+
+    /**
+     * 修改公告
+     *
+     * @param announcement 公告
+     * @return 结果
+     */
+    int updateAnnouncement(Announcement announcement);
+
+    /**
+     * 批量删除公告
+     *
+     * @param ids 需要删除的公告主键集合
+     * @return 结果
+     */
+    int deleteAnnouncementByIds(String[] ids);
+
+    /**
+     * 删除公告信息
+     *
+     * @param id 公告主键
+     * @return 结果
+     */
+    int deleteAnnouncementById(String id);
+
+    /**
+     * 记录已读消息
+     * @param announcement
+     * @return
+     */
+    int readAnnouncement(AnnouncementRead announcement);
+
+
+    List<Announcement> getNewAnnouncement(Announcement announcement);
+}

sooka-jnb/src/main/java/com/sooka/jnb/my/service/impl/AnnouncementServiceImpl.java

@@ -0,0 +1,130 @@
+package com.sooka.jnb.my.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.sooka.jnb.my.domain.Announcement;
+import com.sooka.jnb.my.domain.AnnouncementRead;
+import com.sooka.jnb.my.mapper.AnnouncementMapper;
+import com.sooka.jnb.my.service.IAnnouncementService;
+import com.sooka.jnb.utils.UUID;
+import org.springframework.stereotype.Service;
+
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 公告Service业务层处理
+ *
+ * @author LG
+ * @date 2024-03-02
+ */
+@Service
+public class AnnouncementServiceImpl implements IAnnouncementService {
+    @Resource
+    private AnnouncementMapper announcementMapper;
+
+    /**
+     * 查询公告
+     *
+     * @param id 公告主键
+     * @return 公告
+     */
+    @Override
+    public Announcement selectAnnouncementById(String id) {
+        return announcementMapper.selectAnnouncementById(id);
+    }
+
+    /**
+     * 查询公告列表
+     *
+     * @param announcement 公告
+     * @return 公告
+     */
+    @Override
+    public List<Announcement> selectAnnouncementList(Announcement announcement) {
+        return announcementMapper.selectAnnouncementList(announcement);
+    }
+
+    /**
+     * 新增公告
+     *
+     * @param announcement 公告
+     * @return 结果
+     */
+    @Override
+    public int insertAnnouncement(Announcement announcement) {
+        announcement.setId(UUID.getUUID());
+        //如果请求参数中没有创建人, 则从缓存中获取.
+        if (announcement.getCreateBy() == null || "".equals(announcement.getCreateBy())) {
+            announcement.setCreateBy(SecurityUtils.getUserId().toString());
+        }
+
+        if(announcement.getValidityStartTime() == null){
+            announcement.setValidityStartTime(DateUtils.getNowDate());
+        }
+        announcement.setCreateTime(DateUtils.getNowDate());
+        return announcementMapper.insertAnnouncement(announcement);
+    }
+
+    /**
+     * 修改公告
+     *
+     * @param announcement 公告
+     * @return 结果
+     */
+    @Override
+    public int updateAnnouncement(Announcement announcement) {
+        announcement.setUpdateBy(SecurityUtils.getUserId().toString());
+        announcement.setUpdateTime(DateUtils.getNowDate());
+        return announcementMapper.updateAnnouncement(announcement);
+    }
+
+    /**
+     * 批量删除公告
+     *
+     * @param ids 需要删除的公告主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAnnouncementByIds(String[] ids) {
+        return announcementMapper.deleteAnnouncementByIds(ids);
+    }
+
+    /**
+     * 删除公告信息
+     *
+     * @param id 公告主键
+     * @return 结果
+     */
+    @Override
+    public int deleteAnnouncementById(String id) {
+        return announcementMapper.deleteAnnouncementById(id);
+    }
+
+    /**
+     * 新增已读消息记录
+     *
+     * @param announcement
+     * @return
+     */
+
+    @Override
+    public int readAnnouncement(AnnouncementRead announcement) {
+        announcement.setId(UUID.getUUID());
+        announcement.setCreateTime(DateUtils.getNowDate());
+        return announcementMapper.readAnnouncement(announcement);
+    }
+
+    @Override
+    public List<Announcement> getNewAnnouncement(Announcement announcement) {
+        announcement.setReadType("0");
+        List<Announcement> dataList = announcementMapper.getNewAnnouncement(announcement);
+        if(StringUtils.isEmpty(dataList)){
+            announcement.setReadType("1");
+            return announcementMapper.getNewAnnouncement(announcement);
+        }
+        return dataList;
+    }
+}

sooka-jnb/src/main/java/com/sooka/jnb/quotations/domain/JnbQuotations.java

@@ -55,15 +55,6 @@ public class JnbQuotations extends BaseEntity
     /** 删除状态 */
     private String delFlag;
 
-    /** 产品配置id */
-    @Excel(name = "产品配置id")
-    private String configId;
-
-    /** 图片路径 */
-    @TableField(exist = false)
-    private String imgUrlList;
-
-    @TableField(exist = false)
-    private Integer imgType;
+    private String url;
 
 }

sooka-jnb/src/main/java/com/sooka/jnb/quotations/domain/JnbQuotationsConfig.java

@@ -42,4 +42,6 @@ public class JnbQuotationsConfig extends BaseEntity
 
     /** 子分类 */
     private List<JnbQuotationsConfig> children;
+
+    private  String imgUrlList;
 }

sooka-jnb/src/main/java/com/sooka/jnb/quotations/service/IJnbQuotationsConfigService.java

@@ -50,7 +50,7 @@ public interface IJnbQuotationsConfigService
     /**
      * 批量删除行情产品配置
      * 
-     * @param ids 需要删除的行情产品配置主键集合
+     * @param id 需要删除的行情产品配置主键集合
      * @return 结果
      */
     public int deleteJnbQuotationsConfigByIds(Long id);

sooka-jnb/src/main/java/com/sooka/jnb/quotations/service/IJnbQuotationsService.java

@@ -18,7 +18,7 @@ public interface IJnbQuotationsService
      * @param id 行情主键
      * @return 行情
      */
-    public JnbQuotations selectJnbQuotationsById(Long id,Integer type);
+    public JnbQuotations selectJnbQuotationsById(Long id);
 
     /**
      * 查询行情列表
@@ -50,6 +50,6 @@ public interface IJnbQuotationsService
      * @param ids 需要删除的行情主键集合
      * @return 结果
      */
-    public int deleteJnbQuotationsByIds(Long[] ids ,Integer type);
+    public int deleteJnbQuotationsByIds(Long[] ids);
 
 }

sooka-jnb/src/main/java/com/sooka/jnb/quotations/service/impl/JnbQuotationsConfigServiceImpl.java

@@ -1,13 +1,13 @@
 package com.sooka.jnb.quotations.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.sooka.jnb.highServer.domain.JnbHighServerImg;
+import com.sooka.jnb.highServer.mapper.JnbHighServerImgMapper;
+import com.sooka.jnb.quotations.domain.JnbQuotations;
 import com.sooka.jnb.quotations.domain.JnbQuotationsConfig;
 import com.sooka.jnb.quotations.domain.vo.JnbQuotationsTreeVO;
 import com.sooka.jnb.quotations.mapper.JnbQuotationsConfigMapper;
@@ -16,6 +16,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
 
 
 /**
@@ -31,8 +34,9 @@ public class JnbQuotationsConfigServiceImpl implements IJnbQuotationsConfigServi
     @Autowired
     private JnbQuotationsConfigMapper jnbQuotationsConfigMapper;
 
-    @Autowired
-    private RedisTemplate redisTemplate;
+    @Resource
+    private JnbHighServerImgMapper jnbHighServerImgMapper;
+
 
 
     /**
@@ -57,9 +61,8 @@ public class JnbQuotationsConfigServiceImpl implements IJnbQuotationsConfigServi
 //            return (JnbQuotationsTreeVO<JnbQuotationsConfig>) redisTemplate.opsForValue().get(QUOTATIONS_TREE);
 //        }
         List<JnbQuotationsConfig> jnbQuotationsConfigs = jnbQuotationsConfigMapper.selectAllQuotationsConfig(jnbQuotations);
-        JnbQuotationsTreeVO<JnbQuotationsConfig> jnbQuotationsConfig = initTree(jnbQuotationsConfigs);
-//        redisTemplate.boundValueOps(QUOTATIONS_TREE).set(jnbQuotationsConfig, 1, TimeUnit.HOURS);
-        return jnbQuotationsConfig;
+        //        redisTemplate.boundValueOps(QUOTATIONS_TREE).set(jnbQuotationsConfig, 1, TimeUnit.HOURS);
+        return (JnbQuotationsTreeVO<JnbQuotationsConfig>) initTree(jnbQuotationsConfigs);
     }
 
     /**
@@ -93,7 +96,7 @@ public class JnbQuotationsConfigServiceImpl implements IJnbQuotationsConfigServi
         if (firstLevels == null || firstLevels.isEmpty()) {
             //判断fristLevels是否为null(或元素个数为0)
             //必须先判空,否则容易出现空指针异常
-            throw new RuntimeException("行情产品配置数据异常");
+            return new JnbQuotationsTreeVO();
         }
         for (JnbQuotationsConfig firstLevel : firstLevels) {
             // 一级分类对象的id就是二级分类对象的父分类id
@@ -178,6 +181,7 @@ public class JnbQuotationsConfigServiceImpl implements IJnbQuotationsConfigServi
         return jnbQuotationsConfigMapper.updateJnbQuotationsConfig(jnbQuotationsConfig);
     }
 
+
     /**
      * 批量删除行情产品配置
      *

sooka-jnb/src/main/java/com/sooka/jnb/quotations/service/impl/JnbQuotationsServiceImpl.java

@@ -40,12 +40,8 @@ public class JnbQuotationsServiceImpl implements IJnbQuotationsService {
      * @return 行情
      */
     @Override
-    public JnbQuotations selectJnbQuotationsById(Long id,Integer type) {
+    public JnbQuotations selectJnbQuotationsById(Long id) {
         JnbQuotations jnbQuotations = jnbQuotationsMapper.selectJnbQuotationsById(id);
-        String s =jnbHighServerImgMapper.selectAll(id,type);
-        if (null != s) {
-            jnbQuotations.setImgUrlList(jnbHighServerImgMapper.selectAll(id,type));
-        }
         return jnbQuotations;
     }
 
@@ -75,22 +71,6 @@ public class JnbQuotationsServiceImpl implements IJnbQuotationsService {
         jnbQuotations.setCreateBy(SecurityUtils.getUserId().toString());
         jnbQuotations.setCreateTime(DateUtils.getNowDate());
         int insert = jnbQuotationsMapper.insertJnbQuotations(jnbQuotations);
-        if (insert > 0) {
-            List<String> imgUrlList = Arrays.asList(jnbQuotations.getImgUrlList().split(","));
-            if (!ObjectUtils.isEmpty(imgUrlList)) {
-                List<JnbHighServerImg> imgList = new ArrayList<>();
-                imgUrlList.forEach(a -> {
-                    JnbHighServerImg serverImg = new JnbHighServerImg();
-                    serverImg.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
-                    serverImg.setCreateTime(DateUtils.getNowDate());
-                    serverImg.setServerId(jnbQuotations.getId());
-                    serverImg.setImgUrl(a);
-                    serverImg.setType(13);
-                    imgList.add(serverImg);
-                });
-                jnbHighServerImgMapper.saveJnbHighServerImg(imgList);
-            }
-        }
         return insert;
     }
 
@@ -104,28 +84,9 @@ public class JnbQuotationsServiceImpl implements IJnbQuotationsService {
     public int updateJnbQuotations(JnbQuotations jnbQuotations) {
         jnbQuotations.setUpdateBy(SecurityUtils.getUsername());
         jnbQuotations.setUpdateTime(DateUtils.getNowDate());
-        img(jnbQuotations.getImgUrlList(), jnbHighServerImgMapper, jnbQuotations.getId(), jnbQuotations);
         return jnbQuotationsMapper.updateJnbQuotations(jnbQuotations);
     }
 
-    public static void img(String imgUrlList2, JnbHighServerImgMapper jnbHighServerImgMapper, Long id, JnbQuotations jnbQuotations) {
-        List<String> imgUrlList = Arrays.asList(imgUrlList2.split(","));
-        if (!ObjectUtils.isEmpty(imgUrlList)) {
-            List<JnbHighServerImg> imgList = new ArrayList<>();
-            jnbHighServerImgMapper.deleteJnbHighServerByServerId(id,13);
-            imgUrlList.forEach(a -> {
-                JnbHighServerImg serverImg = new JnbHighServerImg();
-                serverImg.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
-                serverImg.setCreateTime(DateUtils.getNowDate());
-                serverImg.setServerId(id);
-                serverImg.setImgUrl(a);
-                serverImg.setType(13);
-                imgList.add(serverImg);
-            });
-            jnbHighServerImgMapper.saveJnbHighServerImg(imgList);
-        }
-    }
-
     /**
      * 批量删除行情
      *
@@ -134,11 +95,8 @@ public class JnbQuotationsServiceImpl implements IJnbQuotationsService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int deleteJnbQuotationsByIds(Long[] ids,Integer type) {
+    public int deleteJnbQuotationsByIds(Long[] ids) {
         int i = jnbQuotationsMapper.deleteJnbQuotationsByIds(ids);
-        if (i > 0) {
-            jnbHighServerImgMapper.deleteJnbHighServerByServerIds(ids,type);
-        }
         return i;
     }
 

sooka-jnb/src/main/java/com/sooka/jnb/utils/UUID.java

@@ -0,0 +1,495 @@
+package com.sooka.jnb.utils;
+
+
+import com.ruoyi.common.exception.UtilException;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * 提供通用唯一识别码（universally unique identifier）（UUID）实现
+ *
+ * @author ruoyi
+ */
+public final class UUID implements java.io.Serializable, Comparable<UUID>
+{
+    private static final long serialVersionUID = -1185015143654744140L;
+
+    /**
+     * SecureRandom 的单例
+     *
+     */
+    private static class Holder
+    {
+        static final SecureRandom numberGenerator = getSecureRandom();
+    }
+
+    /** 此UUID的最高64有效位 */
+    private final long mostSigBits;
+
+    /** 此UUID的最低64有效位 */
+    private final long leastSigBits;
+
+    /**
+     * 私有构造
+     *
+     * @param data 数据
+     */
+    private UUID(byte[] data)
+    {
+        long msb = 0;
+        long lsb = 0;
+        assert data.length == 16 : "data must be 16 bytes in length";
+        for (int i = 0; i < 8; i++)
+        {
+            msb = (msb << 8) | (data[i] & 0xff);
+        }
+        for (int i = 8; i < 16; i++)
+        {
+            lsb = (lsb << 8) | (data[i] & 0xff);
+        }
+        this.mostSigBits = msb;
+        this.leastSigBits = lsb;
+    }
+
+    /**
+     * 使用指定的数据构造新的 UUID。
+     *
+     * @param mostSigBits 用于 {@code UUID} 的最高有效 64 位
+     * @param leastSigBits 用于 {@code UUID} 的最低有效 64 位
+     */
+    public UUID(long mostSigBits, long leastSigBits)
+    {
+        this.mostSigBits = mostSigBits;
+        this.leastSigBits = leastSigBits;
+    }
+
+    /**
+     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的本地线程伪随机数生成器生成该 UUID。
+     *
+     * @return 随机生成的 {@code UUID}
+     */
+    public static UUID fastUUID()
+    {
+        return randomUUID(false);
+    }
+
+    /**
+     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
+     *
+     * @return 随机生成的 {@code UUID}
+     */
+    public static UUID randomUUID()
+    {
+        return randomUUID(true);
+    }
+
+    /**
+     * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
+     *
+     * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码，否则可以得到更好的性能
+     * @return 随机生成的 {@code UUID}
+     */
+    public static UUID randomUUID(boolean isSecure)
+    {
+        final Random ng = isSecure ? Holder.numberGenerator : getRandom();
+
+        byte[] randomBytes = new byte[16];
+        ng.nextBytes(randomBytes);
+        randomBytes[6] &= 0x0f; /* clear version */
+        randomBytes[6] |= 0x40; /* set to version 4 */
+        randomBytes[8] &= 0x3f; /* clear variant */
+        randomBytes[8] |= 0x80; /* set to IETF variant */
+        return new UUID(randomBytes);
+    }
+
+    /**
+     * 根据指定的字节数组获取类型 3（基于名称的）UUID 的静态工厂。
+     *
+     * @param name 用于构造 UUID 的字节数组。
+     *
+     * @return 根据指定数组生成的 {@code UUID}
+     */
+    public static UUID nameUUIDFromBytes(byte[] name)
+    {
+        MessageDigest md;
+        try
+        {
+            md = MessageDigest.getInstance("MD5");
+        }
+        catch (NoSuchAlgorithmException nsae)
+        {
+            throw new InternalError("MD5 not supported");
+        }
+        byte[] md5Bytes = md.digest(name);
+        md5Bytes[6] &= 0x0f; /* clear version */
+        md5Bytes[6] |= 0x30; /* set to version 3 */
+        md5Bytes[8] &= 0x3f; /* clear variant */
+        md5Bytes[8] |= 0x80; /* set to IETF variant */
+        return new UUID(md5Bytes);
+    }
+
+    /**
+     * 根据 {@link #toString()} 方法中描述的字符串标准表示形式创建{@code UUID}。
+     *
+     * @param name 指定 {@code UUID} 字符串
+     * @return 具有指定值的 {@code UUID}
+     * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常
+     *
+     */
+    public static UUID fromString(String name)
+    {
+        String[] components = name.split("-");
+        if (components.length != 5)
+        {
+            throw new IllegalArgumentException("Invalid UUID string: " + name);
+        }
+        for (int i = 0; i < 5; i++)
+        {
+            components[i] = "0x" + components[i];
+        }
+
+        long mostSigBits = Long.decode(components[0]).longValue();
+        mostSigBits <<= 16;
+        mostSigBits |= Long.decode(components[1]).longValue();
+        mostSigBits <<= 16;
+        mostSigBits |= Long.decode(components[2]).longValue();
+
+        long leastSigBits = Long.decode(components[3]).longValue();
+        leastSigBits <<= 48;
+        leastSigBits |= Long.decode(components[4]).longValue();
+
+        return new UUID(mostSigBits, leastSigBits);
+    }
+
+    /**
+     * 返回此 UUID 的 128 位值中的最低有效 64 位。
+     *
+     * @return 此 UUID 的 128 位值中的最低有效 64 位。
+     */
+    public long getLeastSignificantBits()
+    {
+        return leastSigBits;
+    }
+
+    /**
+     * 返回此 UUID 的 128 位值中的最高有效 64 位。
+     *
+     * @return 此 UUID 的 128 位值中最高有效 64 位。
+     */
+    public long getMostSignificantBits()
+    {
+        return mostSigBits;
+    }
+
+    /**
+     * 与此 {@code UUID} 相关联的版本号. 版本号描述此 {@code UUID} 是如何生成的。
+     * <p>
+     * 版本号具有以下含意:
+     * <ul>
+     * <li>1 基于时间的 UUID
+     * <li>2 DCE 安全 UUID
+     * <li>3 基于名称的 UUID
+     * <li>4 随机生成的 UUID
+     * </ul>
+     *
+     * @return 此 {@code UUID} 的版本号
+     */
+    public int version()
+    {
+        // Version is bits masked by 0x000000000000F000 in MS long
+        return (int) ((mostSigBits >> 12) & 0x0f);
+    }
+
+    /**
+     * 与此 {@code UUID} 相关联的变体号。变体号描述 {@code UUID} 的布局。
+     * <p>
+     * 变体号具有以下含意：
+     * <ul>
+     * <li>0 为 NCS 向后兼容保留
+     * <li>2 <a href="http://www.ietf.org/rfc/rfc4122.txt">IETF&nbsp;RFC&nbsp;4122</a>(Leach-Salz), 用于此类
+     * <li>6 保留，微软向后兼容
+     * <li>7 保留供以后定义使用
+     * </ul>
+     *
+     * @return 此 {@code UUID} 相关联的变体号
+     */
+    public int variant()
+    {
+        // This field is composed of a varying number of bits.
+        // 0 - - Reserved for NCS backward compatibility
+        // 1 0 - The IETF aka Leach-Salz variant (used by this class)
+        // 1 1 0 Reserved, Microsoft backward compatibility
+        // 1 1 1 Reserved for future definition.
+        return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63));
+    }
+
+    /**
+     * 与此 UUID 相关联的时间戳值。
+     *
+     * <p>
+     * 60 位的时间戳值根据此 {@code UUID} 的 time_low、time_mid 和 time_hi 字段构造。<br>
+     * 所得到的时间戳以 100 毫微秒为单位，从 UTC（通用协调时间） 1582 年 10 月 15 日零时开始。
+     *
+     * <p>
+     * 时间戳值仅在在基于时间的 UUID（其 version 类型为 1）中才有意义。<br>
+     * 如果此 {@code UUID} 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
+     *
+     * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。
+     */
+    public long timestamp() throws UnsupportedOperationException
+    {
+        checkTimeBase();
+        return (mostSigBits & 0x0FFFL) << 48//
+                | ((mostSigBits >> 16) & 0x0FFFFL) << 32//
+                | mostSigBits >>> 32;
+    }
+
+    /**
+     * 与此 UUID 相关联的时钟序列值。
+     *
+     * <p>
+     * 14 位的时钟序列值根据此 UUID 的 clock_seq 字段构造。clock_seq 字段用于保证在基于时间的 UUID 中的时间唯一性。
+     * <p>
+     * {@code clockSequence} 值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。 如果此 UUID 不是基于时间的 UUID，则此方法抛出
+     * UnsupportedOperationException。
+     *
+     * @return 此 {@code UUID} 的时钟序列
+     *
+     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
+     */
+    public int clockSequence() throws UnsupportedOperationException
+    {
+        checkTimeBase();
+        return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48);
+    }
+
+    /**
+     * 与此 UUID 相关的节点值。
+     *
+     * <p>
+     * 48 位的节点值根据此 UUID 的 node 字段构造。此字段旨在用于保存机器的 IEEE 802 地址，该地址用于生成此 UUID 以保证空间唯一性。
+     * <p>
+     * 节点值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。<br>
+     * 如果此 UUID 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
+     *
+     * @return 此 {@code UUID} 的节点值
+     *
+     * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
+     */
+    public long node() throws UnsupportedOperationException
+    {
+        checkTimeBase();
+        return leastSigBits & 0x0000FFFFFFFFFFFFL;
+    }
+
+    /**
+     * 返回此{@code UUID} 的字符串表现形式。
+     *
+     * <p>
+     * UUID 的字符串表示形式由此 BNF 描述：
+     *
+     * <pre>
+     * {@code
+     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
+     * time_low               = 4*<hexOctet>
+     * time_mid               = 2*<hexOctet>
+     * time_high_and_version  = 2*<hexOctet>
+     * variant_and_sequence   = 2*<hexOctet>
+     * node                   = 6*<hexOctet>
+     * hexOctet               = <hexDigit><hexDigit>
+     * hexDigit               = [0-9a-fA-F]
+     * }
+     * </pre>
+     *
+     * </blockquote>
+     *
+     * @return 此{@code UUID} 的字符串表现形式
+     * @see #toString(boolean)
+     */
+    @Override
+    public String toString()
+    {
+        return toString(false);
+    }
+
+    /**
+     * 返回此{@code UUID} 的字符串表现形式。
+     *
+     * <p>
+     * UUID 的字符串表示形式由此 BNF 描述：
+     *
+     * <pre>
+     * {@code
+     * UUID                   = <time_low>-<time_mid>-<time_high_and_version>-<variant_and_sequence>-<node>
+     * time_low               = 4*<hexOctet>
+     * time_mid               = 2*<hexOctet>
+     * time_high_and_version  = 2*<hexOctet>
+     * variant_and_sequence   = 2*<hexOctet>
+     * node                   = 6*<hexOctet>
+     * hexOctet               = <hexDigit><hexDigit>
+     * hexDigit               = [0-9a-fA-F]
+     * }
+     * </pre>
+     *
+     * </blockquote>
+     *
+     * @param isSimple 是否简单模式，简单模式为不带'-'的UUID字符串
+     * @return 此{@code UUID} 的字符串表现形式
+     */
+    public String toString(boolean isSimple)
+    {
+        final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
+        // time_low
+        builder.append(digits(mostSigBits >> 32, 8));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // time_mid
+        builder.append(digits(mostSigBits >> 16, 4));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // time_high_and_version
+        builder.append(digits(mostSigBits, 4));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // variant_and_sequence
+        builder.append(digits(leastSigBits >> 48, 4));
+        if (false == isSimple)
+        {
+            builder.append('-');
+        }
+        // node
+        builder.append(digits(leastSigBits, 12));
+
+        return builder.toString();
+    }
+
+    /**
+     * 返回此 UUID 的哈希码。
+     *
+     * @return UUID 的哈希码值。
+     */
+    @Override
+    public int hashCode()
+    {
+        long hilo = mostSigBits ^ leastSigBits;
+        return ((int) (hilo >> 32)) ^ (int) hilo;
+    }
+
+    /**
+     * 将此对象与指定对象比较。
+     * <p>
+     * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值（每一位均相同）时，结果才为 {@code true}。
+     *
+     * @param obj 要与之比较的对象
+     *
+     * @return 如果对象相同，则返回 {@code true}；否则返回 {@code false}
+     */
+    @Override
+    public boolean equals(Object obj)
+    {
+        if ((null == obj) || (obj.getClass() != UUID.class))
+        {
+            return false;
+        }
+        UUID id = (UUID) obj;
+        return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits);
+    }
+
+    // Comparison Operations
+
+    /**
+     * 将此 UUID 与指定的 UUID 比较。
+     *
+     * <p>
+     * 如果两个 UUID 不同，且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段，则第一个 UUID 大于第二个 UUID。
+     *
+     * @param val 与此 UUID 比较的 UUID
+     *
+     * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。
+     *
+     */
+    @Override
+    public int compareTo(UUID val)
+    {
+        // The ordering is intentionally set up so that the UUIDs
+        // can simply be numerically compared as two numbers
+        return (this.mostSigBits < val.mostSigBits ? -1 : //
+                (this.mostSigBits > val.mostSigBits ? 1 : //
+                        (this.leastSigBits < val.leastSigBits ? -1 : //
+                                (this.leastSigBits > val.leastSigBits ? 1 : //
+                                        0))));
+    }
+
+    // -------------------------------------------------------------------------------------------------------------------
+    // Private method start
+    /**
+     * 返回指定数字对应的hex值
+     *
+     * @param val 值
+     * @param digits 位
+     * @return 值
+     */
+    private static String digits(long val, int digits)
+    {
+        long hi = 1L << (digits * 4);
+        return Long.toHexString(hi | (val & (hi - 1))).substring(1);
+    }
+
+    /**
+     * 检查是否为time-based版本UUID
+     */
+    private void checkTimeBase()
+    {
+        if (version() != 1)
+        {
+            throw new UnsupportedOperationException("Not a time-based UUID");
+        }
+    }
+
+    /**
+     * 获取{@link SecureRandom}，类提供加密的强随机数生成器 (RNG)
+     *
+     * @return {@link SecureRandom}
+     */
+    public static SecureRandom getSecureRandom()
+    {
+        try
+        {
+            return SecureRandom.getInstance("SHA1PRNG");
+        }
+        catch (NoSuchAlgorithmException e)
+        {
+            throw new UtilException(e);
+        }
+    }
+
+    /**
+     * 获取随机数生成器对象<br>
+     * ThreadLocalRandom是JDK 7之后提供并发产生随机数，能够解决多个线程发生的竞争争夺。
+     *
+     * @return {@link ThreadLocalRandom}
+     */
+    public static ThreadLocalRandom getRandom()
+    {
+        return ThreadLocalRandom.current();
+    }
+
+    /**
+     * 获取32位UUID
+     * @return 值
+     */
+    public static String getUUID() {
+        String uuid = java.util.UUID.randomUUID().toString();
+        return uuid.substring(0, 8) + uuid.substring(9, 13) + uuid.substring(14, 18) + uuid.substring(19, 23) + uuid.substring(24);
+    }
+}

sooka-jnb/src/main/java/com/sooka/jnb/wenba/service/impl/wenbaServiceImpl.java

@@ -1,12 +1,12 @@
-package com.sooka.jnb.wenba.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.core.domain.entity.WxUser;
-import com.sooka.jnb.wenba.mapper.wenbaMapper;
-import com.sooka.jnb.wenba.service.wenbaService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class wenbaServiceImpl extends ServiceImpl<wenbaMapper, WxUser> implements wenbaService {
-
-}
+//package com.sooka.jnb.wenba.service.impl;
+//
+//
+//import com.ruoyi.common.core.domain.entity.WxUser;
+//
+//import com.sooka.jnb.department.service.departmentService;
+//import org.springframework.stereotype.Service;
+//
+//@Service
+//public class wenbaServiceImpl extends departmentService {
+//
+//}

sooka-jnb/src/main/resources/mapper/department/DepartmentMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sooka.jnb.department.mapper.DepartmentMapper">
+
+    <resultMap type="com.sooka.jnb.department.domin.Department" id="DepartmentResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="name"    />
+        <result property="shows"    column="shows"    />
+        <result property="application"    column="application"    />
+    </resultMap>
+
+    <select id="selectSysDeptVo"  resultMap="DepartmentResult">
+        select  id,name, shows, application from jnb_department_configuration
+        <where>
+            <if test="name != null and name !=''">
+                AND name LIKE '%' #{name} '%'
+            </if>
+            <if test="application != null and application !=''">
+                AND application LIKE '%' #{application} '%'
+            </if>
+        </where>
+    </select>
+
+    <select id="selectSysDeptById"  resultMap="DepartmentResult">
+       select  id, name, shows, application from jnb_department_configuration
+        where id = #{id}
+    </select>
+
+    <insert id="insertSysDept">
+        INSERT INTO
+        jnb_department_configuration (name, shows, application)
+        VALUE (#{name},#{shows},#{application})
+    </insert>
+
+    <update id="updateSysDept" parameterType="SysDept">
+        update jnb_department_configuration
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="shows != null">shows = #{shows},</if>
+            <if test="application != null">application = #{application},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSysDeptByDeptId" parameterType="Long">
+        delete from jnb_department_configuration where id = #{id}
+    </delete>
+</mapper>

sooka-jnb/src/main/resources/mapper/handleAffairs/TopicTypeMapper.xml

@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and del_flag = 0
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="yesOrNoShow != null  and yesOrNoShow != ''"> and yes_or_no_show = #{yesOrNoShow}</if>
-            <if test="objectOfHandling != null  and objectOfHandling != ''"> and object_of_handling = #{objectOfHandling}</if>
+            <if test="objectOfHandling != null  and objectOfHandling != ''"> and object_of_handling like concat('%',#{objectOfHandling},'%')</if>
         </where>
     </select>
     

sooka-jnb/src/main/resources/mapper/highServer/JnbHighServerImgMapper.xml

@@ -28,4 +28,13 @@
             and type = #{type}
         </if>
     </select>
+    <select id="selectAllList" resultType="java.lang.String">
+        select img_url from jnb_high_server_img where del_flag = 0
+        <if test="serverId != null and serverId !=''">
+           and server_id = #{serverId}
+        </if>
+        <if test="type != null and type !=''">
+            and type = #{type}
+        </if>
+    </select>
 </mapper>

sooka-jnb/src/main/resources/mapper/highServer/JnbHighServerMapper.xml

@@ -27,7 +27,9 @@
                jhs.update_by,
                jhs.update_time,
                GROUP_CONCAT(jhsi.id)       AS imgId,
-               GROUP_CONCAT(jhsi.img_url)  AS imgUrlList
+               GROUP_CONCAT(jhsi.img_url)  AS imgUrlList,
+               jhs.like_num,
+               jhs.watch_num
         FROM jnb_high_server jhs
                  left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
         where jhs.del_flag = 0 and jhs.type = #{type}
@@ -39,6 +41,7 @@
         <if test="textDetails != null  and textDetails != ''">and text_details = #{textDetails}</if>
         <if test="type != null ">and jhs.type = #{type}</if>
         GROUP BY jhs.id
+        order by create_time,watch_num,like_num desc
     </select>
 
     <select id="selectJnbHighServerById" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
@@ -98,4 +101,80 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="getLiveBroadcast" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+        title_name,
+        text_details,
+        jhs.type as type,
+        jhs.create_by,
+        jhs.create_time,
+        jhs.update_by,
+        jhs.update_time,
+        GROUP_CONCAT(jhsi.id)       AS imgId,
+        GROUP_CONCAT(jhsi.img_url)  AS imgUrlList,
+        jhs.like_num,
+        jhs.watch_num
+        FROM jnb_high_server jhs
+        left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 5
+        GROUP BY jhs.id
+        order by create_time,watch_num,like_num desc
+    </select>
+    <select id="liveBroadcastDetails" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+        title_name,
+        text_details,
+        jhs.type as type,
+        jhs.create_by,
+        jhs.create_time,
+        jhs.update_by,
+        jhs.update_time,
+        GROUP_CONCAT(jhsi.id) AS imgId,
+        GROUP_CONCAT(jhsi.img_url) AS imgUrlList,
+        jhs.like_num,
+        jhs.watch_num
+        FROM jnb_high_server jhs
+        left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 5 and jhs.id = #{id}
+        GROUP BY jhs.id
+    </select>
+
+    <select id="getLifeServices" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+               title_name,
+               text_details,
+               jhs.type as type,
+               jhs.create_by,
+               jhs.create_time,
+               jhs.update_by,
+               jhs.update_time,
+               GROUP_CONCAT(jhsi.id)       AS imgId,
+               GROUP_CONCAT(jhsi.img_url)  AS imgUrlList,
+               jhs.like_num,
+               jhs.watch_num
+        FROM jnb_high_server jhs
+                 left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 6
+        GROUP BY jhs.id
+        order by create_time,watch_num,like_num desc
+    </select>
+    <select id="lifeServicesDetails" resultType="com.sooka.jnb.highServer.vo.JnbHighServerVO">
+        SELECT jhs.id,
+               title_name,
+               text_details,
+               jhs.type as type,
+               jhs.create_by,
+               jhs.create_time,
+               jhs.update_by,
+               jhs.update_time,
+               GROUP_CONCAT(jhsi.id) AS imgId,
+               GROUP_CONCAT(jhsi.img_url) AS imgUrlList,
+               jhs.like_num,
+               jhs.watch_num
+        FROM jnb_high_server jhs
+                 left JOIN jnb_high_server_img jhsi ON jhs.id = jhsi.server_id and jhs.type = jhsi.type and jhsi.del_flag = 0
+        where jhs.del_flag = 0 and jhs.type = 6 and jhs.id = #{id}
+        GROUP BY jhs.id
+    </select>
 </mapper>

sooka-jnb/src/main/resources/mapper/information/InformationMapper.xml

@@ -16,10 +16,14 @@
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="headImg" column="head_img"/>
+        <result property="imgUrlList" column="imgUrlList"/>
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
     </resultMap>
 
+
     <sql id="selectInformationVo">
         select id,
                title_name,
@@ -62,24 +66,58 @@
         order by create_time desc
     </select>
 
-    <select id="selectInformationListWxs" parameterType="Information" resultMap="InformationResult">
-        <include refid="selectInformationVo"/>
-        <where>
-            <if test="titleName != null  and titleName != ''">and title_name like concat('%', #{titleName}, '%')</if>
-            <if test="type != null and type != ''">and type = #{type}</if>
-            <if test="isGovernment != null and isGovernment != ''">and is_government = #{isGovernment}</if>
-            <if test="isTop != null and isTop != ''">and is_top = #{isTop}</if>
-            and del_flag = 0
-        </where>
+
+    <resultMap type="Information" id="InformationResult1">
+        <id property="id" column="id"/>
+        <result property="titleName" column="title_name"/>
+        <result property="textDetails" column="text_details"/>
+        <result property="type" column="type"/>
+        <result property="isGovernment" column="is_government"/>
+        <result property="likeNum" column="like_num"/>
+        <result property="watchNum" column="watch_num"/>
+        <result property="isTop" column="is_top"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <collection property="urls" ofType="java.lang.String">
+            <result column="url" property="url"/>
+        </collection>
+    </resultMap>
+
+    <select id="selectInformationListWxs"  resultMap="InformationResult1">
+        SELECT
+        a.id,
+        a.title_name,
+        a.text_details,
+        a.type,
+        a.create_by,
+        a.create_time,
+        a.update_by,
+        a.update_time,
+        a.del_flag,
+        a.is_government,
+        a.is_top,
+        a.like_num,
+        a.watch_num,
+        i.img_url AS url
+        FROM jnb_high_server AS a
+        LEFT JOIN jnb_high_server_img AS i ON a.id = i.server_id AND i.del_flag = 0 AND i.type = #{obj.type}
+        where a.del_flag = 0
+            <if test="obj.titleName != null  and obj.titleName != ''">and a.title_name like concat('%', #{obj.titleName}, '%')</if>
+            <if test="obj.type != null and obj.type != ''">and a.type = #{obj.type}</if>
+            <if test="obj.isGovernment != null and obj.isGovernment != ''">and a.is_government = #{obj.isGovernment}</if>
+            <if test="obj.isTop != null and obj.isTop != ''">and a.is_top = #{obj.isTop}</if>
         <choose>
-            <when test="flag == like">
-                ORDER BY like_num DESC
+            <when test="obj.flag == 'like'">
+                ORDER BY a.like_num DESC
             </when>
-            <when test="flag == watch">
-                ORDER BY watch_num DESC
+            <when test="obj.flag == 'watch'">
+                ORDER BY a.watch_num DESC
             </when>
             <otherwise>
-                ORDER BY create_time DESC
+                ORDER BY a.create_time DESC
             </otherwise>
         </choose>
     </select>
@@ -97,8 +135,26 @@
     </select>
 
     <select id="selectInformationById" resultMap="InformationResult">
-        <include refid="selectInformationVo"/>
-        where id = #{id} and type = #{type}
+        SELECT
+            a.id,
+            a.title_name,
+            a.text_details,
+            a.type,
+            a.create_by,
+            a.create_time,
+            a.update_by,
+            a.update_time,
+            a.del_flag,
+            a.is_government,
+            a.is_top,
+            a.like_num,
+            a.watch_num,
+            b.wechat_name as nick_name,
+            b.head_img as head_img
+        FROM
+            jnb_high_server AS a
+                LEFT JOIN jnb_wx_user AS b ON b.id = a.create_by
+        where a.id = #{id} and a.type = #{type}
     </select>
 
     <insert id="insertInformation" parameterType="Information" useGeneratedKeys="true" keyProperty="id">
@@ -135,6 +191,18 @@
         WHERE id = #{id} and type = #{type}
     </update>
 
+    <update id="updateInformationLike">
+        UPDATE jnb_high_server
+        SET like_num = like_num +1
+        WHERE id = #{id} and type = #{type}
+    </update>
+
+    <update id="updateInformationWatch">
+        UPDATE jnb_high_server
+        SET watch_num = watch_num+1
+        WHERE id = #{id} and type = #{type}
+    </update>
+
     <delete id="deleteInformationByIds" >
         UPDATE jnb_high_server
         SET del_flag = 2

sooka-jnb/src/main/resources/mapper/knowledge/JnbKnowledgeBaseMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="integral"    column="integral"    />
         <result property="likeNum"    column="like_num"    />
         <result property="watchNum"    column="watch_num"    />
+        <result property="createId"    column="create_id"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -28,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             integral,
             like_num,
             watch_num,
+            jkb.create_id,
             jkb.create_by,
             jkb.create_time,
             jkb.update_by,
@@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="integral != null">integral,</if>
             <if test="likeNum != null">like_num,</if>
             <if test="watchNum != null">watch_num,</if>
+            <if test="createId != null">create_id,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -81,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="integral != null">#{integral},</if>
             <if test="likeNum != null">#{likeNum},</if>
             <if test="watchNum != null">#{watchNum},</if>
+            <if test="createId != null">#{createId},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -122,4 +126,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where id = #{id}
     </update>
+    <select id="popularKnowledgeList" resultType="com.sooka.jnb.knowledge.vo.JnbKnowledgeBaseVO">
+        SELECT
+            jkb.id,
+            title_name,
+            text_details,
+            popular,
+            integral,
+            like_num,
+            watch_num,
+            jkb.create_id,
+            jkb.create_by,
+            jkb.create_time,
+            jkb.update_by,
+            jkb.update_time ,
+            GROUP_CONCAT(jkbi.id)       AS imgId,
+            GROUP_CONCAT(jkbi.img_url)  AS imgUrlList
+        FROM
+            jnb_knowledge_base jkb
+                left join jnb_knowledge_base_img jkbi on jkb.id = jkbi.knowledge_id and jkbi.del_flag = 0
+        where jkb.del_flag = 0 and popular = 1
+        GROUP BY jkb.id
+        order by create_time,watch_num,like_num desc
+    </select>
 </mapper>

sooka-jnb/src/main/resources/mapper/matter/matterMapper.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sooka.jnb.matter.mapper.MatterMapper">
+
+    <resultMap type="com.sooka.jnb.matter.domin.Matter" id="MatterResult">
+        <result property="id"    column="id"    />
+        <result property="title"    column="title"    />
+        <result property="type"    column="type"    />
+        <result property="department"    column="department"    />
+        <result property="operation"    column="operation"    />
+        <result property="address"    column="address"    />
+        <result property="phone"    column="phone"    />
+        <result property="picture"    column="picture"    />
+        <result property="examine"    column="examine"    />
+        <result property="content"    column="content"    />
+    </resultMap>
+
+
+    <select id="selectSysMatterVo"  resultMap="MatterResult">
+        select  id,title, type, department,operation,address,phone,picture,examine ,content from jnb_list_of_matters
+        <where>
+            <if test="title != null and title !=''">
+                AND title LIKE '%' #{title} '%'
+            </if>
+            <if test="examine != null and examine !=''">
+                AND examine LIKE '%' #{examine} '%'
+            </if>
+        </where>
+    </select>
+
+    <select id="selectSysMatterById"  resultMap="MatterResult">
+       select  id ,title, type, department,operation,address,phone,picture,examine,content from jnb_list_of_matters
+        where id = #{id}
+    </select>
+
+    <insert id="insertSysMatter">
+       INSERT INTO
+           jnb_list_of_matters (title, type, department,operation,address,phone,picture,content )
+        VALUE (#{title},#{type},#{department},#{operation},#{address},#{phone},#{picture},#{content} )
+    </insert>
+
+    <update id="updateSysMatter" parameterType="SysDept">
+        update jnb_list_of_matters
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null">title = #{title},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="department != null">department = #{department},</if>
+            <if test="operation != null">operation = #{operation},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="picture != null">picture = #{picture},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="content != null">content = #{content},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="examine" parameterType="SysDept">
+        update jnb_list_of_matters
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="examine != null">examine = #{examine}</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSysMatterByDeptId" parameterType="Long">
+        delete from jnb_list_of_matters where id = #{id}
+    </delete>
+</mapper>

sooka-jnb/src/main/resources/mapper/my/AnnouncementMapper.xml

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sooka.jnb.my.mapper.AnnouncementMapper">
+    
+    <resultMap type="Announcement" id="AnnouncementResult">
+        <result property="id"    column="id"    />
+        <result property="announcementTitle"    column="announcement_title"    />
+        <result property="announcementBody"    column="announcement_body"    />
+        <result property="validityStartTime"    column="validity_start_time"    />
+        <result property="validityEndTime"    column="validity_end_time"    />
+        <result property="announcementImg"    column="announcement_img"    />
+        <result property="userId"    column="user_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="readType" column="read_type"/>
+    </resultMap>
+
+    <sql id="selectAnnouncementVo">
+        select id, announcement_title, announcement_body, validity_start_time, validity_end_time, announcement_img, user_id, create_by, create_time, update_by, update_time from jnb_announcement
+    </sql>
+
+    <sql id="selectList">
+        select
+        a.*,
+        CASE WHEN ar.id IS NULL THEN 0 ELSE 1 END AS read_type
+        FROM jnb_announcement a
+        LEFT JOIN jnb_announcement_read ar ON a.id = ar.anno_id
+        <where>
+            and del_flag = 1
+            <if test="announcementTitle != null  and announcementTitle != ''">
+                and announcement_title like concat('%', #{announcementTitle}, '%')
+            </if>
+            <if test="validityStartTime != null">
+                and validity_start_time &gt;= #{validityStartTime}
+            </if>
+            <if test="validityEndTime != null ">
+                and (validity_end_time &lt;= #{validityEndTime} or validity_end_time is null)
+            </if>
+            <if test="userId != null  and userId != ''">
+                and (a.user_id = #{userId} or a.user_id is null)
+                and (validity_end_time &gt;= DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00') or validity_end_time is null)
+            </if>
+        </where>
+        order by validity_start_time desc
+    </sql>
+
+    <select id="selectAnnouncementList" parameterType="Announcement" resultMap="AnnouncementResult">
+        <include refid="selectList"/>
+    </select>
+    
+    <select id="selectAnnouncementById" parameterType="string" resultMap="AnnouncementResult">
+        select a.id,
+               a.announcement_title,
+               a.announcement_body,
+               a.validity_start_time,
+               a.validity_end_time,
+               a.announcement_img,
+               a.user_id,
+               uc.nick_name as create_by,
+               a.create_time,
+               uu.nick_name as update_by,
+               a.update_time
+        from jnb_announcement a
+        left join sys_user uc on a.create_by = uc.user_id
+        left join sys_user uu on a.update_by = uu.user_id
+        where id = #{id}
+    </select>
+        
+    <insert id="insertAnnouncement" parameterType="Announcement" useGeneratedKeys="true" keyProperty="id">
+        insert into jnb_announcement
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">id,</if>
+            <if test="announcementTitle != null and announcementTitle != ''">announcement_title,</if>
+            <if test="announcementBody != null and announcementBody != ''">announcement_body,</if>
+            <if test="validityStartTime != null">validity_start_time,</if>
+            <if test="validityEndTime != null">validity_end_time,</if>
+            <if test="announcementImg != null">announcement_img,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            del_flag,
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">#{id},</if>
+            <if test="announcementTitle != null and announcementTitle != ''">#{announcementTitle},</if>
+            <if test="announcementBody != null and announcementBody != ''">#{announcementBody},</if>
+            <if test="validityStartTime != null">#{validityStartTime},</if>
+            <if test="validityEndTime != null">#{validityEndTime},</if>
+            <if test="announcementImg != null">#{announcementImg},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            1,
+         </trim>
+    </insert>
+
+    <update id="updateAnnouncement" parameterType="Announcement">
+        update jnb_announcement
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="announcementTitle != null and announcementTitle != ''">announcement_title = #{announcementTitle},</if>
+            <if test="announcementBody != null and announcementBody != ''">announcement_body = #{announcementBody},</if>
+            <if test="validityStartTime != null">validity_start_time = #{validityStartTime},</if>
+            <if test="validityEndTime != null">validity_end_time = #{validityEndTime},</if>
+            <if test="announcementImg != null">announcement_img = #{announcementImg},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteAnnouncementById" parameterType="string">
+        update jnb_announcement set del_flag = 0 where id = #{id}
+    </update>
+
+    <update id="deleteAnnouncementByIds" parameterType="string">
+        update jnb_announcement set del_flag = 0 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <insert id="readAnnouncement" parameterType="announcementRead">
+        insert into jnb_announcement_read(id, user_id, anno_id, create_time)
+        values(#{id}, #{userId}, #{annoId}, #{createTime})
+    </insert>
+
+    <select id="getNewAnnouncement" parameterType="announcement" resultMap="AnnouncementResult">
+        select * from
+        (<include refid="selectList"/> ) anno_table
+        where read_type = #{readType} limit 3
+    </select>
+</mapper>

sooka-jnb/src/main/resources/mapper/quotations/JnbQuotationsConfigMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectJnbQuotationsConfigVo"/>
         <where>  
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
+            <if test="parentId != null  and parentId != ''"> and parent_id like concat('%', #{parentId}, '%')</if>
             and del_flag = 0
         </where>
     </select>

sooka-jnb/src/main/resources/mapper/quotations/JnbQuotationsMapper.xml

@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectJnbQuotationsVo">
-        select id, product_name, area, type, price, phone, address, create_by, create_time, del_flag from jnb_quotations
+        select id, product_name, area, type, price, phone, address,url, create_by, create_time, del_flag from jnb_quotations
     </sql>
 
     <select id="selectJnbQuotationsList" parameterType="JnbQuotations" resultMap="JnbQuotationsResult">
@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
             <if test="area != null  and area != ''"> and area = #{area}</if>
+            <if test="type != null  and type != ''"> and type = #{type}</if>
              and del_flag = 0
         </where>
     </select>
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="price != null">price,</if>
             <if test="phone != null">phone,</if>
             <if test="address != null">address,</if>
+            <if test="url != null">url,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -67,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="price != null">#{price},</if>
             <if test="phone != null">#{phone},</if>
             <if test="address != null">#{address},</if>
+            <if test="url != null">#{url},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -84,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="price != null">price = #{price},</if>
             <if test="phone != null">phone = #{phone},</if>
             <if test="address != null">address = #{address},</if>
+            <if test="url != null">address = #{url},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>