Merge remote-tracking branch 'origin/master'

# Conflicts:
#	zhjq-ui/src/views/system/scenery/index.vue

zhjq-admin/src/main/resources/application-druid.yml

@@ -6,12 +6,12 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://www.sooka.onest.db:63306/zhjq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: sooka
-        password: sooka1a2b3c4d%...
-#        url: jdbc:mysql://1.94.255.6:53306/zhjq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-#        username: root
-#        password: sooka123456
+#        url: jdbc:mysql://www.sooka.onest.db:63306/zhjq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        username: sooka
+#        password: sooka1a2b3c4d%...
+        url: jdbc:mysql://1.94.255.6:53306/zhjq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: root
+        password: Sooka12345!!@#$%
 #        url: jdbc:mysql://192.168.10.15:63306/zhjq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #        username: sooka
 #        password: sooka1a2b3c4d%...

zhjq-admin/src/main/resources/application.yml

@@ -7,8 +7,8 @@ ruoyi:
   # 版权年份
   copyrightYear: 2024
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-#  profile: /a-zhjq/zhjq/uploadPath
-  profile: D:/ruoyi/uploadPath
+  profile: /a-zhjq/zhjq/uploadPath
+#  profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证

zhjq-business/src/main/java/com/zhjq/mapper/ZhjqSceneryMapper.java

@@ -59,4 +59,21 @@ public interface ZhjqSceneryMapper {
      * @return 结果
      */
     public int deleteZhjqSceneryByIds(Long[] ids);
+
+    /**
+     * 根据groupId查询全部groupId
+     *
+     * @param groupId 需要查询的数据键
+     * @return 结果
+     */
+    public ZhjqScenery selectZhjqSceneryGroupIdsByGroupId(String groupId);
+
+    /**
+     * 根据sceneryCode查询全部sceneryCode
+     *
+     * @param sceneryCode 需要查询的数据键
+     * @return 结果
+     */
+    public ZhjqScenery selectZhjqScenerySceneryCodesBySceneryCode(String sceneryCode);
+
 }

zhjq-business/src/main/java/com/zhjq/quartz/PersonCountGroupJob.java

@@ -27,6 +27,7 @@ import org.apache.http.impl.client.LaxRedirectStrategy;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;

zhjq-business/src/main/resources/mapper/ZhjqSceneryMapper.xml

@@ -140,4 +140,16 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectZhjqSceneryGroupIdsByGroupId" parameterType="String"
+            resultMap="ZhjqSceneryResult">
+        <include refid="selectZhjqSceneryVo"/>
+        where 1=1 and FIND_IN_SET(#{groupId}, group_id)
+    </select>
+
+    <select id="selectZhjqScenerySceneryCodesBySceneryCode" parameterType="String"
+            resultMap="ZhjqSceneryResult">
+        <include refid="selectZhjqSceneryVo"/>
+        where 1=1 and FIND_IN_SET(#{sceneryCode}, scenery_code)
+    </select>
 </mapper>