feat: 更改linux支持的字体

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java

@@ -181,9 +181,9 @@ public interface StaffMapper {
 
     /**
      * 查询企业下所有成员ID
-     * @param enterpriseId
+     * @param wxEnterpriseIds
      * @return
      */
-    List<String> queryStaffIdsWithEnterpriseId(@Param("enterpriseId") String enterpriseId);
+    List<String> queryStaffIdsWithEnterpriseId(@Param("wxEnterpriseIds") List<String> wxEnterpriseIds);
     
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/StaffService.java

@@ -146,8 +146,8 @@ public interface StaffService {
 
     /**
      * 查询企业下所有成员id
-     * @param enterpriseId
+     * @param wxEnterpriseIds
      * @return
      */
-    List<String> queryStaffIdsWithEnterpriseId(String enterpriseId);
+    List<String> queryStaffIdsWithEnterpriseId(List<String> wxEnterpriseIds);
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffServiceImpl.java

@@ -268,15 +268,15 @@ public class StaffServiceImpl implements StaffService {
     /**
      * 查询企业下所有成员id
      *
-     * @param enterpriseId
+     * @param wxEnterpriseIds
      * @return
      */
     @Override
-    public List<String> queryStaffIdsWithEnterpriseId(String enterpriseId) {
+    public List<String> queryStaffIdsWithEnterpriseId(List<String> wxEnterpriseIds) {
 
-        if (StringUtils.isBlank(enterpriseId)) {
+        if (CollectionUtils.isEmpty(wxEnterpriseIds)) {
             return Collections.emptyList();
         }
-        return this.mapper.queryStaffIdsWithEnterpriseId(enterpriseId);
+        return this.mapper.queryStaffIdsWithEnterpriseId(wxEnterpriseIds);
     }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/content/task/QywxGroupMsgTaskApiServiceImpl.java

@@ -123,13 +123,13 @@ public class QywxGroupMsgTaskApiServiceImpl implements QywxGroupMsgTaskApiServic
             return ServiceResponse.success();
         }
 
-
         for (String enterpriseId : enterpriseIds) {
             List<String> wxEnterpriseIds = wxEnterpriseService.queryWxEnterpriseWithEnterpriseId(enterpriseId);
             if (CollectionUtils.isEmpty(wxEnterpriseIds)) {
-
+                log.info("企业 {}未关联企微", enterpriseId);
+                continue;
             }
-            List<String> staffIds = staffService.queryStaffIdsWithEnterpriseId(enterpriseId);
+            List<String> staffIds = staffService.queryStaffIdsWithEnterpriseId(wxEnterpriseIds);
             if (CollectionUtils.isEmpty(staffIds)) {
                 log.info("企业 {} 不存在成员", enterpriseId);
                 continue;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/util/DrawImageUtils.java

@@ -41,7 +41,7 @@ public class DrawImageUtils {
             Graphics2D pen = image.createGraphics();
             pen.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
             pen.setColor(Color.WHITE);
-            Font font = new Font("微软雅黑", Font.BOLD, 56);
+            Font font = new Font("宋体", Font.BOLD, 56);
             pen.setFont(font);
             FontMetrics metrics = pen.getFontMetrics(font);
             int startX = 40 + (260 - metrics.stringWidth(materialNum)) / 2;
@@ -63,4 +63,12 @@ public class DrawImageUtils {
         }
         return null;
     }
+
+    public static void main(String[] args) {
+        System.setProperty("gic.module.name", "haoban-manage3-service");
+        for (int i = 0; i < 50; i++) {
+            String url = DrawImageUtils.drawImage("jhdm", "102", "3.1万", "template/week_bkg.png");
+            System.out.println(url);
+        }
+    }
 }

haoban-manage3-service/src/main/resources/mapper/StaffMapper.xml

@@ -622,7 +622,11 @@
     <select id="queryStaffIdsWithEnterpriseId" resultType="java.lang.String">
         select staff_id
             from tab_haoban_staff
-        where status_flag = 1 and enterprise_id = #{enterpriseId}
+        where status_flag = 1
+          and wx_enterprise_id in
+          <foreach collection="wxEnterpriseIds" item="wxEnterpriseId" open="(" close=")" separator=",">
+              #{wxEnterpriseId}
+          </foreach>
     </select>
 
 </mapper>
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/WxEnterpriseMapper.xml

@@ -512,7 +512,7 @@
         from tab_haoban_wx_enterprise_related a
                  inner join tab_haoban_wx_enterprise b on a.wx_enterprise_id = b.wx_enterprise_id
         where a.status_flag = 1 and b.status_flag = 1
-        and a.enterprise_id = #{enterprise_id}
+        and a.enterprise_id = #{enterpriseId}
     </select>
 
 </mapper>
\ No newline at end of file