2026-11-03

现场动控模型人员优化

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -116,12 +116,12 @@ public class ScheduleServiceImpl implements ScheduleService {
     private RestTemplate restTemplate;
 
     // 测试环境接口
-//    @Value("${mes.logs.base-url:https://www.rfid2print.net/CloudProdLogsD/api/logs}")
-//    private String mesLogsBaseUrl;
-
-    @Value("${mes.logs.base-url:http://logs.bt.in/api/logs}")
+    @Value("${mes.logs.base-url:https://www.rfid2print.net/CloudProdLogsD/api/logs}")
     private String mesLogsBaseUrl;
 
+//    @Value("${mes.logs.base-url:http://logs.bt.in/api/logs}")
+//    private String mesLogsBaseUrl;
+
     @Value("${mes.logs.username:BOINGTECH}")
     private String mesLogsUsername;
 

src/main/resources/mapper/sys/SysSceneDynamicControlModelMapper.xml

@@ -250,18 +250,19 @@
 	</select>
 
 	<sql id="personValueWhere">
-		WHERE site = #{site}
-		  AND (#{keyword} = '' OR operator_id LIKE '%' + #{keyword} + '%' OR operator_name LIKE '%' + #{keyword} + '%')
+		WHERE (site = #{site} OR EXISTS (SELECT 1 FROM AccessSite s WHERE s.userID = sys_user.username AND s.site = #{site}))
+		  AND (status IS NULL OR status = 1)
+		  AND (#{keyword} = '' OR username LIKE '%' + #{keyword} + '%' OR user_display LIKE '%' + #{keyword} + '%')
 	</sql>
 	<select id="countPersonValue" resultType="int">
-		SELECT COUNT(1) FROM operator
+		SELECT COUNT(1) FROM sys_user
 		<include refid="personValueWhere"/>
 	</select>
 	<select id="searchPersonValue" resultType="com.gaotao.modules.sys.entity.SysSceneDynamicControlScopeEntity">
-		SELECT operator_id AS valueCode, operator_name AS valueName
-		FROM operator
+		SELECT username AS valueCode, ISNULL(user_display, username) AS valueName
+		FROM sys_user
 		<include refid="personValueWhere"/>
-		ORDER BY operator_id
+		ORDER BY username
 		OFFSET #{offset} ROWS FETCH NEXT #{limit} ROWS ONLY
 	</select>
 </mapper>