Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/controller/CooperativeController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2024-03-01
  */
 @RestController
-@RequestMapping("/system/cooperative")
+@RequestMapping("/high/server/cooperative")
 public class CooperativeController extends BaseController
 {
     @Autowired
@@ -38,7 +38,7 @@ public class CooperativeController extends BaseController
     /**
      * 查询供销合作社列表
      */
-    @PreAuthorize("@ss.hasPermi('system:cooperative:list')")
+//    @PreAuthorize("@ss.hasPermi('highfrequency:cooperative:list')")
     @GetMapping("/list")
     public TableDataInfo list(Cooperative cooperative)
     {
@@ -50,7 +50,7 @@ public class CooperativeController extends BaseController
     /**
      * 导出供销合作社列表
      */
-    @PreAuthorize("@ss.hasPermi('system:cooperative:export')")
+    @PreAuthorize("@ss.hasPermi('highfrequency:cooperative:export')")
     @Log(title = "供销合作社", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, Cooperative cooperative)
@@ -63,7 +63,7 @@ public class CooperativeController extends BaseController
     /**
      * 获取供销合作社详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:cooperative:query')")
+//    @PreAuthorize("@ss.hasPermi('highfrequency:cooperative:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -73,7 +73,7 @@ public class CooperativeController extends BaseController
     /**
      * 新增供销合作社
      */
-    @PreAuthorize("@ss.hasPermi('system:cooperative:add')")
+    @PreAuthorize("@ss.hasPermi('highfrequency:cooperative:add')")
     @Log(title = "供销合作社", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Cooperative cooperative)
@@ -84,7 +84,7 @@ public class CooperativeController extends BaseController
     /**
      * 修改供销合作社
      */
-    @PreAuthorize("@ss.hasPermi('system:cooperative:edit')")
+    @PreAuthorize("@ss.hasPermi('highfrequency:cooperative:edit')")
     @Log(title = "供销合作社", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Cooperative cooperative)
@@ -95,7 +95,7 @@ public class CooperativeController extends BaseController
     /**
      * 删除供销合作社
      */
-    @PreAuthorize("@ss.hasPermi('system:cooperative:remove')")
+    @PreAuthorize("@ss.hasPermi('highfrequency:cooperative:remove')")
     @Log(title = "供销合作社", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

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

@@ -126,4 +126,22 @@ public class JnbHighServerController extends BaseController {
     public AjaxResult lifeServicesDetails(@PathVariable Long id) {
         return success(jnbHighServerService.lifeServicesDetails(id));
     }
+
+    /**
+     * 小程序获取旅游向导列表
+     */
+    @GetMapping("/travelGuideList")
+    public TableDataInfo getTravelGuide(JnbHighServer jnbHighServer) {
+        startPage();
+        List<JnbHighServerVO> list = jnbHighServerService.getTravelGuide(jnbHighServer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 小程序获取旅游向导详情
+     */
+    @GetMapping("/travelGuideDetails/{id}")
+    public AjaxResult travelGuideDetails(@PathVariable Long id) {
+        return success(jnbHighServerService.travelGuideDetails(id));
+    }
 }

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

@@ -41,7 +41,7 @@ public class InformationController extends BaseController
      * 点赞
      */
     @PostMapping("/like")
-    public AjaxResult like(Information information){
+    public AjaxResult like(@RequestBody Information information){
         return toAjax(informationService.likeById(information));
     }
 
@@ -50,7 +50,7 @@ public class InformationController extends BaseController
      * 浏览
      */
     @PostMapping("/watch")
-    public AjaxResult watchById(Information information){
+    public AjaxResult watchById(@RequestBody Information information){
         return toAjax(informationService.watchById(information));
     }
 
@@ -75,7 +75,7 @@ public class InformationController extends BaseController
     @GetMapping("/listWx")
     public AjaxResult listWx(Information information)
     {
-        List<Information> list = informationService.selectInformationListWx(information);
+        List<InformationUni> list = informationService.selectInformationListWx(information);
         return AjaxResult.success(list);
     }
 

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

@@ -34,7 +34,14 @@ public class matterConllter extends BaseController {
             List<Matter> list = matterService.selectSysMatterVo(matter);
             return getDataTable(list);
         }
-
+    /**
+     * 查询事项列表
+     */
+    @GetMapping("/listAll")
+    public AjaxResult listAll(Matter matter)
+    {
+        return success(matterService.selectSysMatterVo(matter));
+    }
         /**
          * 获取事项详细信息
          */

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

@@ -0,0 +1,128 @@
+package com.ruoyi.web.controller.my;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+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.sooka.jnb.my.domain.JnbImg;
+import com.sooka.jnb.my.service.IJnbImgService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 图片管理Controller
+ * 
+ * @author LG
+ * @date 2024-03-05
+ */
+@RestController
+@RequestMapping("/my/img")
+public class JnbImgController extends BaseController
+{
+    @Autowired
+    private IJnbImgService jnbImgService;
+
+    /**
+     * 查询图片管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('my:img:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(JnbImg jnbImg)
+    {
+        startPage();
+        List<JnbImg> list = jnbImgService.selectJnbImgList(jnbImg);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出图片管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('my:img:export')")
+    @Log(title = "图片管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, JnbImg jnbImg)
+    {
+        List<JnbImg> list = jnbImgService.selectJnbImgList(jnbImg);
+        ExcelUtil<JnbImg> util = new ExcelUtil<JnbImg>(JnbImg.class);
+        util.exportExcel(response, list, "图片管理数据");
+    }
+
+    /**
+     * 获取图片管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('my:img:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(jnbImgService.selectJnbImgById(id));
+    }
+
+    /**
+     * 新增图片管理
+     */
+    @PreAuthorize("@ss.hasPermi('my:img:add')")
+    @Log(title = "图片管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody JnbImg jnbImg)
+    {
+        return toAjax(jnbImgService.insertJnbImg(jnbImg));
+    }
+
+    /**
+     * 修改图片管理
+     */
+    @PreAuthorize("@ss.hasPermi('my:img:edit')")
+    @Log(title = "图片管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody JnbImg jnbImg)
+    {
+        return toAjax(jnbImgService.updateJnbImg(jnbImg));
+    }
+
+    /**
+     * 删除图片管理
+     */
+    @PreAuthorize("@ss.hasPermi('my:img:remove')")
+    @Log(title = "图片管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(jnbImgService.deleteJnbImgByIds(ids));
+    }
+
+    /**
+     * 查看是否存在封面图片
+     */
+    @GetMapping("/isCover")
+    public AjaxResult isCover(){
+        return AjaxResult.success(jnbImgService.isCover());
+    }
+
+    /**
+     * 获取当前封面图片
+     */
+    @GetMapping("/getCover")
+    public AjaxResult getCover(){
+        return AjaxResult.success("操作成功",jnbImgService.getCover());
+    }
+
+    /**
+     * 获取当前轮播图
+     */
+    @GetMapping("/getCarousel")
+    public AjaxResult getCarousel() {
+        return AjaxResult.success(jnbImgService.getCarousel());
+    }
+}

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

@@ -90,6 +90,19 @@ public class JnbNameAuthenticationController extends BaseController {
     }
 
     /*
+    * 审核实名认证
+    *
+    * @author 韩福成
+    * @date 2024/3/5 11:09
+    */
+    @PreAuthorize("@ss.hasPermi('nameAuthentication:edit')")
+    @Log(title = "审核实名认证", businessType = BusinessType.UPDATE)
+    @PutMapping("/through")
+    public AjaxResult through(@RequestBody JnbNameAuthentication jnbNameAuthentication) {
+        return toAjax(jnbNameAuthenticationService.through(jnbNameAuthentication));
+    }
+
+    /*
     * 小程序-提交实名认证
     *
     * @author 韩福成

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

@@ -97,6 +97,19 @@ public class JnbOfficialAuthenticationController extends BaseController {
     }
 
     /*
+    * 审核官方认证
+    *
+    * @author 韩福成
+    * @date 2024/3/5 13:55
+    */
+    @PreAuthorize("@ss.hasPermi('officialAuthentication:edit')")
+    @Log(title = "审核官方认证", businessType = BusinessType.UPDATE)
+    @PutMapping("/through")
+    public AjaxResult through(@RequestBody JnbOfficialAuthentication jnbOfficialAuthentication) {
+        return toAjax(jnbOfficialAuthenticationService.through(jnbOfficialAuthentication));
+    }
+
+    /*
     * 小程序-官方认证提交
     *
     * @author 韩福成

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

@@ -87,7 +87,7 @@ public class ScoreController extends BaseController {
                 return AjaxResult.error("减少积分失败!");
             }
         } else {
-            return AjaxResult.error("用户积分不足, 减少积分失败!");
+            return AjaxResult.error("用户积分不足!");
         }
     }
 

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

@@ -68,4 +68,11 @@ public interface JnbHighServerMapper {
     List<JnbHighServerVO> getLifeServices(JnbHighServer jnbHighServer);
 
     JnbHighServerVO lifeServicesDetails(Long id);
+
+    List<JnbHighServerVO> getTravelGuide(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO travelGuideDetails(Long id);
+
+    void updateLikeNumber(@Param("id") Long id, @Param("type") Integer type);
+    void updateWatchNumber(@Param("id") Long id, @Param("type") Integer type);
 }

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

@@ -67,4 +67,8 @@ public interface IJnbHighServerService {
     List<JnbHighServerVO> getLifeServices(JnbHighServer jnbHighServer);
 
     JnbHighServerVO lifeServicesDetails(Long id);
+
+    List<JnbHighServerVO> getTravelGuide(JnbHighServer jnbHighServer);
+
+    JnbHighServerVO travelGuideDetails(Long id);
 }

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

@@ -150,6 +150,8 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
         if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
             jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
         }
+        jnbHighServerMapper.updateLikeNumber(id,5);
+        jnbHighServerMapper.updateWatchNumber(id,5);
         return jnbHighServerVO;
     }
 
@@ -170,6 +172,28 @@ public class JnbHighServerServiceImpl implements IJnbHighServerService {
         if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
             jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
         }
+        jnbHighServerMapper.updateLikeNumber(id,6);
+        jnbHighServerMapper.updateWatchNumber(id,6);
+        return jnbHighServerVO;
+    }
+
+    @Override
+    public List<JnbHighServerVO> getTravelGuide(JnbHighServer jnbHighServer) {
+        List<JnbHighServerVO> list = jnbHighServerMapper.getTravelGuide(jnbHighServer);
+        for (JnbHighServerVO var : list) {
+            if (StringUtils.isNotEmpty(var.getImgUrlList())) {
+                var.setPictureList(Arrays.asList(var.getImgUrlList().split(",")));
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public JnbHighServerVO travelGuideDetails(Long id) {
+        JnbHighServerVO jnbHighServerVO = jnbHighServerMapper.travelGuideDetails(id);
+        if (StringUtils.isNotEmpty(jnbHighServerVO.getImgUrlList())) {
+            jnbHighServerVO.setPictureList(Arrays.asList(jnbHighServerVO.getImgUrlList().split(",")));
+        }
         return jnbHighServerVO;
     }
 }

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

@@ -1,6 +1,7 @@
 package com.sooka.jnb.information.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
@@ -38,6 +39,7 @@ public class InformationUni extends BaseEntity
 
     /** 是否置顶 */
     @Excel(name = "是否置顶", readConverterExp = "1=是,0=否")
+    @JsonProperty("top")
     private Integer isTop;
 
     /** 点赞数 */

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

@@ -33,7 +33,7 @@ public interface InformationService
      */
     public List<Information> selectInformationList(Information information);
 
-    public List<Information> selectInformationListWx(Information information);
+    public List<InformationUni> selectInformationListWx(Information information);
 
 
     /**

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

@@ -59,14 +59,20 @@ public class InformationServiceImpl implements InformationService
     }
 
     @Override
-    public List<Information> selectInformationListWx(Information information)
+    public List<InformationUni> selectInformationListWx(Information information)
     {
-        return informationMapper.selectInformationListWx(information);
+        List<Information> list = informationMapper.selectInformationListWx(information);
+        return list.stream().map(item -> {
+            InformationUni uni = new InformationUni();
+            BeanUtils.copyProperties(item, uni);
+            return uni;
+        }).collect(Collectors.toList());
     }
     @Override
     public TableDataInfo selectInformationListWxs(Information information, Integer pageNum, Integer pageSize)
     {
 //        List<Information> result = informationMapper.selectInformationListWxs(information,pageNum, pageSize);
+        System.out.println(information.getIsTop());
         List<Information> toolForAbsenteeism = informationMapper.selectInformationListWxs(information,pageNum, pageSize);
         TableDataInfo tableDataInfo = new TableDataInfo();
         tableDataInfo.setRows(toolForAbsenteeism.stream() .skip((long) (pageNum - 1) * pageSize)

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 String createId;
 
     public void setId(Long id) {
         this.id = id;
@@ -112,6 +117,13 @@ public class JnbKnowledgeBase extends BaseEntity {
         return watchNum;
     }
 
+    public void setCreateId(String createId) {
+        this.createId = createId;
+    }
+
+    public String 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/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().toString());
         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())) {

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 String createId;
 }

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

@@ -0,0 +1,57 @@
+package com.sooka.jnb.my.domain;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.ibatis.type.Alias;
+
+/**
+ * 图片管理对象 jnb_img
+ *
+ * @author LG
+ * @date 2024-03-05
+ */
+@Data
+@Alias("jnbImg")
+public class JnbImg extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 数据id
+     */
+    private Long id;
+
+    /**
+     * 图片路径
+     */
+    private String imgUrl;
+
+    /**
+     * 图片名称
+     */
+    private String imgName;
+
+    /**
+     * 开关
+     */
+    private String imgSwitch;
+
+    /**
+     * 图片类型：1封面图片；2：轮播图片
+     */
+    private String imgType;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("imgUrl", getImgUrl())
+                .append("imgName", getImgName())
+                .append("switch", getImgSwitch())
+                .append("imgType", getImgType())
+                .toString();
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.sooka.jnb.my.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.sooka.jnb.my.domain.JnbImg;
+
+/**
+ * 图片管理Mapper接口
+ *
+ * @author LG
+ * @date 2024-03-05
+ */
+public interface JnbImgMapper {
+    /**
+     * 查询图片管理
+     *
+     * @param id 图片管理主键
+     * @return 图片管理
+     */
+    public JnbImg selectJnbImgById(Long id);
+
+    /**
+     * 查询图片管理列表
+     *
+     * @param jnbImg 图片管理
+     * @return 图片管理集合
+     */
+    public List<JnbImg> selectJnbImgList(JnbImg jnbImg);
+
+    /**
+     * 新增图片管理
+     *
+     * @param jnbImg 图片管理
+     * @return 结果
+     */
+    public int insertJnbImg(JnbImg jnbImg);
+
+    /**
+     * 修改图片管理
+     *
+     * @param jnbImg 图片管理
+     * @return 结果
+     */
+    public int updateJnbImg(JnbImg jnbImg);
+
+    /**
+     * 删除图片管理
+     *
+     * @param id 图片管理主键
+     * @return 结果
+     */
+    public int deleteJnbImgById(Long id);
+
+    /**
+     * 批量删除图片管理
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteJnbImgByIds(Long[] ids);
+
+    Map<String, String> isCover();
+
+    String getCover();
+
+    List<String> getCarousel();
+}

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

@@ -0,0 +1,67 @@
+package com.sooka.jnb.my.service;
+
+import java.util.List;
+
+import com.sooka.jnb.my.domain.JnbImg;
+
+/**
+ * 图片管理Service接口
+ *
+ * @author LG
+ * @date 2024-03-05
+ */
+public interface IJnbImgService {
+    /**
+     * 查询图片管理
+     *
+     * @param id 图片管理主键
+     * @return 图片管理
+     */
+    public JnbImg selectJnbImgById(Long id);
+
+    /**
+     * 查询图片管理列表
+     *
+     * @param jnbImg 图片管理
+     * @return 图片管理集合
+     */
+    public List<JnbImg> selectJnbImgList(JnbImg jnbImg);
+
+    /**
+     * 新增图片管理
+     *
+     * @param jnbImg 图片管理
+     * @return 结果
+     */
+    public int insertJnbImg(JnbImg jnbImg);
+
+    /**
+     * 修改图片管理
+     *
+     * @param jnbImg 图片管理
+     * @return 结果
+     */
+    public int updateJnbImg(JnbImg jnbImg);
+
+    /**
+     * 批量删除图片管理
+     *
+     * @param ids 需要删除的图片管理主键集合
+     * @return 结果
+     */
+    public int deleteJnbImgByIds(Long[] ids);
+
+    /**
+     * 删除图片管理信息
+     *
+     * @param id 图片管理主键
+     * @return 结果
+     */
+    public int deleteJnbImgById(Long id);
+
+    boolean isCover();
+
+    String getCover();
+
+    List<String> getCarousel();
+}

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

@@ -52,6 +52,14 @@ public interface IJnbNameAuthenticationService {
      */
     public int deleteJnbNameAuthenticationByIds(String[] ids);
 
+    /*
+    * 审核
+    *
+    * @author 韩福成
+    * @date 2024/3/5 11:10
+    */
+    public int through(JnbNameAuthentication jnbNameAuthentication);
+
     /**
      * 删除实名认证信息
      *

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

@@ -51,6 +51,14 @@ public interface IJnbOfficialAuthenticationService {
      */
     public int deleteJnbOfficialAuthenticationByIds(String[] ids);
 
+    /*
+    * 审核官方认证
+    *
+    * @author 韩福成
+    * @date 2024/3/5 13:56
+    */
+    public int through(JnbOfficialAuthentication jnbOfficialAuthentication);
+
     /**
      * 删除官方认证信息
      *

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

@@ -0,0 +1,108 @@
+package com.sooka.jnb.my.service.impl;
+
+import com.sooka.jnb.my.domain.JnbImg;
+import com.sooka.jnb.my.mapper.JnbImgMapper;
+import com.sooka.jnb.my.service.IJnbImgService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 图片管理Service业务层处理
+ *
+ * @author LG
+ * @date 2024-03-05
+ */
+@Service
+public class JnbImgServiceImpl implements IJnbImgService {
+    @Resource
+    private JnbImgMapper jnbImgMapper;
+
+    /**
+     * 查询图片管理
+     *
+     * @param id 图片管理主键
+     * @return 图片管理
+     */
+    @Override
+    public JnbImg selectJnbImgById(Long id) {
+        return jnbImgMapper.selectJnbImgById(id);
+    }
+
+    /**
+     * 查询图片管理列表
+     *
+     * @param jnbImg 图片管理
+     * @return 图片管理
+     */
+    @Override
+    public List<JnbImg> selectJnbImgList(JnbImg jnbImg) {
+        return jnbImgMapper.selectJnbImgList(jnbImg);
+    }
+
+    /**
+     * 新增图片管理
+     *
+     * @param jnbImg 图片管理
+     * @return 结果
+     */
+    @Override
+    public int insertJnbImg(JnbImg jnbImg) {
+        return jnbImgMapper.insertJnbImg(jnbImg);
+    }
+
+    /**
+     * 修改图片管理
+     *
+     * @param jnbImg 图片管理
+     * @return 结果
+     */
+    @Override
+    public int updateJnbImg(JnbImg jnbImg) {
+        return jnbImgMapper.updateJnbImg(jnbImg);
+    }
+
+    /**
+     * 批量删除图片管理
+     *
+     * @param ids 需要删除的图片管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteJnbImgByIds(Long[] ids) {
+        return jnbImgMapper.deleteJnbImgByIds(ids);
+    }
+
+    /**
+     * 删除图片管理信息
+     *
+     * @param id 图片管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteJnbImgById(Long id) {
+        return jnbImgMapper.deleteJnbImgById(id);
+    }
+
+    @Override
+    public boolean isCover() {
+        Map<String, String> cover = jnbImgMapper.isCover();
+        if ("1".equals(cover.get("isCover"))) {
+            return true;
+        }else{
+            return false;
+        }
+    }
+
+    @Override
+    public String getCover() {
+        return jnbImgMapper.getCover();
+    }
+
+    @Override
+    public List<String> getCarousel() {
+        return jnbImgMapper.getCarousel();
+    }
+}

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

@@ -1,15 +1,19 @@
 package com.sooka.jnb.my.service.impl;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.sooka.jnb.my.domain.Announcement;
 import com.sooka.jnb.my.domain.JnbAuthenticationImg;
 import com.sooka.jnb.my.domain.JnbNameAuthentication;
 import com.sooka.jnb.my.mapper.JnbNameAuthenticationMapper;
+import com.sooka.jnb.my.service.IAnnouncementService;
 import com.sooka.jnb.my.service.IJnbNameAuthenticationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.List;
 
 /**
@@ -23,6 +27,9 @@ public class JnbNameAuthenticationServiceImpl implements IJnbNameAuthenticationS
     @Autowired
     private JnbNameAuthenticationMapper jnbNameAuthenticationMapper;
 
+    @Autowired
+    private IAnnouncementService announcementService;
+
     /**
      * 查询实名认证
      *
@@ -106,4 +113,24 @@ public class JnbNameAuthenticationServiceImpl implements IJnbNameAuthenticationS
     public int deleteJnbNameAuthenticationById(String id) {
         return jnbNameAuthenticationMapper.deleteJnbNameAuthenticationById(id);
     }
+
+    /*
+    * 审核
+    *
+    * @author 韩福成
+    * @date 2024/3/5 11:10
+    */
+    @Override
+    public int through(JnbNameAuthentication jnbNameAuthentication) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String data = simpleDateFormat.format(jnbNameAuthentication.getCreateTime());
+        Announcement announcement = new Announcement();
+        announcement.setUserId(IdUtils.simpleUUID());
+        announcement.setCreateBy(SecurityUtils.getUserId().toString());
+        String type = DictUtils.getDictLabel("examine_state",jnbNameAuthentication.getStatus());
+        announcement.setAnnouncementTitle(type+":[实名认证]");
+        announcement.setAnnouncementBody("您在"+data+"发起的[实名认证]信息已["+type+"]");
+        announcementService.insertAnnouncement(announcement);
+        return jnbNameAuthenticationMapper.updateJnbNameAuthentication(jnbNameAuthentication);
+    }
 }

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

@@ -1,18 +1,22 @@
 package com.sooka.jnb.my.service.impl;
 
-import java.util.List;
-
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
+import com.sooka.jnb.my.domain.Announcement;
 import com.sooka.jnb.my.domain.JnbAuthenticationImg;
 import com.sooka.jnb.my.domain.JnbOfficialAuthentication;
 import com.sooka.jnb.my.mapper.JnbNameAuthenticationMapper;
 import com.sooka.jnb.my.mapper.JnbOfficialAuthenticationMapper;
+import com.sooka.jnb.my.service.IAnnouncementService;
 import com.sooka.jnb.my.service.IJnbOfficialAuthenticationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.List;
+
 /**
  * 官方认证Service业务层处理
  *
@@ -27,6 +31,9 @@ public class JnbOfficialAuthenticationServiceImpl implements IJnbOfficialAuthent
     @Autowired
     private JnbNameAuthenticationMapper jnbNameAuthenticationMapper;
 
+    @Autowired
+    private IAnnouncementService announcementService;
+
     /**
      * 查询官方认证
      *
@@ -110,4 +117,24 @@ public class JnbOfficialAuthenticationServiceImpl implements IJnbOfficialAuthent
     public int deleteJnbOfficialAuthenticationById(String id) {
         return jnbOfficialAuthenticationMapper.deleteJnbOfficialAuthenticationById(id);
     }
+
+    /*
+    * 审核官方认证
+    *
+    * @author 韩福成
+    * @date 2024/3/5 13:56
+    */
+    @Override
+    public int through(JnbOfficialAuthentication jnbOfficialAuthentication) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String data = simpleDateFormat.format(jnbOfficialAuthentication.getCreateTime());
+        Announcement announcement = new Announcement();
+        announcement.setUserId(IdUtils.simpleUUID());
+        announcement.setCreateBy(SecurityUtils.getUserId().toString());
+        String type = DictUtils.getDictLabel("examine_state",jnbOfficialAuthentication.getStatus());
+        announcement.setAnnouncementTitle(type+":[官方认证]");
+        announcement.setAnnouncementBody("您在"+data+"发起的[官方认证]信息已["+type+"]");
+        announcementService.insertAnnouncement(announcement);
+        return jnbOfficialAuthenticationMapper.updateJnbOfficialAuthentication(jnbOfficialAuthentication);
+    }
 }

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

@@ -41,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">
@@ -118,6 +119,7 @@
         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,
@@ -155,6 +157,7 @@
                  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,
@@ -174,4 +177,48 @@
         where jhs.del_flag = 0 and jhs.type = 6 and jhs.id = #{id}
         GROUP BY jhs.id
     </select>
+
+    <select id="getTravelGuide" 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 = 1
+        GROUP BY jhs.id
+        order by create_time,watch_num,like_num desc
+    </select>
+    <select id="travelGuideDetails" 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 = 1 and jhs.id = #{id}
+        GROUP BY jhs.id
+    </select>
+    <update id="updateLikeNumber">
+        update jnb_high_server set like_num = like_num + 1 where id = #{id} and type = #{type}
+    </update>
+    <update id="updateWatchNumber">
+        update jnb_high_server set watch_num = watch_num + 1 where id = #{id} and type = #{type}
+    </update>
 </mapper>

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

@@ -107,8 +107,8 @@
         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.isTop!=null">and a.is_top = #{obj.isTop}</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="obj.flag == 'like'">
                 ORDER BY a.like_num DESC

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>
@@ -131,6 +135,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,
@@ -142,5 +147,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 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

@@ -27,6 +27,9 @@
             <if test="examine != null and examine !=''">
                 AND examine LIKE '%' #{examine} '%'
             </if>
+            <if test="type != null and type !=''">
+                AND type = #{type}
+            </if>
         </where>
     </select>
 

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

@@ -0,0 +1,91 @@
+<?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.JnbImgMapper">
+
+    <resultMap type="JnbImg" id="JnbImgResult">
+        <result property="id" column="id"/>
+        <result property="imgUrl" column="img_url"/>
+        <result property="imgName" column="img_name"/>
+        <result property="imgSwitch" column="img_switch"/>
+        <result property="imgType" column="img_type"/>
+    </resultMap>
+
+    <sql id="selectJnbImgVo">
+        select id, img_url, img_name, img_switch, img_type
+        from jnb_img
+    </sql>
+
+    <select id="selectJnbImgList" parameterType="JnbImg" resultMap="JnbImgResult">
+        <include refid="selectJnbImgVo"/>
+        <where>
+            <if test="imgUrl != null  and imgUrl != ''">and img_url = #{imgUrl}</if>
+            <if test="imgName != null  and imgName != ''">and img_name like concat('%', #{imgName}, '%')</if>
+            <if test="imgSwitch != null  and imgSwitch != ''">and img_switch = #{imgSwitch}</if>
+            <if test="imgType != null  and imgType != ''">and img_type = #{imgType}</if>
+        </where>
+    </select>
+
+    <select id="selectJnbImgById" parameterType="Long" resultMap="JnbImgResult">
+        <include refid="selectJnbImgVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertJnbImg" parameterType="JnbImg" useGeneratedKeys="true" keyProperty="id">
+        insert into jnb_img
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="imgUrl != null and imgUrl != ''">img_url,</if>
+            <if test="imgName != null and imgName != ''">img_name,</if>
+            <if test="imgSwitch != null and imgSwitch != ''">img_switch,</if>
+            <if test="imgType != null and imgType != ''">img_type,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="imgUrl != null and imgUrl != ''">#{imgUrl},</if>
+            <if test="imgName != null and imgName != ''">#{imgName},</if>
+            <if test="imgSwitch != null and imgSwitch != ''">#{imgSwitch},</if>
+            <if test="imgType != null and imgType != ''">#{imgType},</if>
+        </trim>
+    </insert>
+
+    <update id="updateJnbImg" parameterType="JnbImg">
+        update jnb_img
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="imgUrl != null and imgUrl != ''">img_url = #{imgUrl},</if>
+            <if test="imgName != null and imgName != ''">img_name = #{imgName},</if>
+            <if test="imgSwitch != null and imgSwitch != ''">img_switch = #{imgSwitch},</if>
+            <if test="imgType != null and imgType != ''">img_type = #{imgType},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteJnbImgById" parameterType="Long">
+        delete
+        from jnb_img
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteJnbImgByIds" parameterType="String">
+        delete from jnb_img where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="isCover" resultType="map">
+        SELECT
+            CASE WHEN COUNT(*) > 0 THEN '1' ELSE '0' END AS isCover
+        FROM
+            jnb_img
+        WHERE
+            img_type = 1 AND img_switch = 'switch_on'
+    </select>
+
+    <select id="getCover" resultType="string">
+        SELECT img_url FROM jnb_img WHERE img_type = 1 AND img_switch = 'switch_on'
+    </select>
+
+    <select id="getCarousel" resultType="string">
+        SELECT img_url FROM jnb_img WHERE img_type = 2 AND img_switch = 'switch_on'
+    </select>
+</mapper>

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

@@ -30,10 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
             <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+        order by create_time desc
     </select>
     
     <select id="selectJnbNameAuthenticationById" parameterType="String" resultMap="JnbNameAuthenticationResult">
-        select a.id, a.name, a.phone, a.id_card, a.status,GROUP_CONCAT(b.path) path
+        select a.id, a.name, a.phone, a.id_card, a.status,GROUP_CONCAT(b.path) path,a.create_time
         from jnb_name_authentication a
 		left join jnb_authentication_img b on a.id = b.authentication_id
         where a.id = #{id}

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

@@ -38,7 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.phone,
             a.legal_name,
             a.STATUS,
-            GROUP_CONCAT( b.path ) path
+            GROUP_CONCAT( b.path ) path,
+            a.create_time
         FROM
             jnb_official_authentication a
             LEFT JOIN jnb_authentication_img b ON a.id = b.authentication_id