BI日志注解更新

src/main/java/com/baosight/hpjx/hp/bi/service/ServiceHPBI001.java

@@ -137,7 +137,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show14")
     public EiInfo queryZLInfo(EiInfo inInfo) {
         EiInfo eiInfo = new EiInfo();
         String serviceId = "S_BE_XP_17";
@@ -194,7 +194,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show17")
     public EiInfo queryXMinfo(EiInfo inInfo) {
         EiInfo eiInfo = new EiInfo();
         String serviceId = "S_BE_XP_17";
@@ -260,7 +260,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show21")
     public EiInfo queryRJCLInfo(EiInfo inInfo) {
         EiInfo eiInfo = new EiInfo();
         String serviceId = "S_BE_XP_17";
@@ -317,7 +317,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show7")
     public EiInfo queryYCLInfo(EiInfo inInfo) {
         EiInfo eiInfo = new EiInfo();
         String serviceId = "S_BE_XP_17";
@@ -374,7 +374,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show6")
     public EiInfo queryHAPlanInfo(EiInfo inInfo) {
         String paramsStr = inInfo.getString(PARAMS_KEY_STR);
         JSONArray jsonArray = (JSONArray) JSONArray.parse(paramsStr);
@@ -440,7 +440,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "测试")
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show9")
     public EiInfo queryMonWtInfo(EiInfo inInfo) {
         String paramsStr = inInfo.getString(PARAMS_KEY_STR);
         JSONArray jsonArray = (JSONArray) JSONArray.parse(paramsStr);
@@ -501,6 +501,7 @@ public class ServiceHPBI001 extends ServiceBase {
      *
      * @return
      */
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "微服务测试方法（柱形图、折线图、饼图）")
     public EiInfo queryMicroServiceBarData(EiInfo eiInfo) {
         EiInfo returnInfo = new EiInfo();
         String paramsStr = eiInfo.getString(PARAMS_KEY_STR);

src/main/java/com/baosight/hpjx/hp/rz/sql/HPRZ001.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
+	<!--      table information
+		Generate time : 2024-02-23 15:28:50
+   		Version :  1.0
+		tableName :hpjx.sys_operation_log 
+		 ID  BIGINT   NOT NULL   primarykey, 
+		 COMPANY_CODE  VARCHAR   NOT NULL, 
+		 CREATED_BY  VARCHAR, 
+		 CREATED_NAME  VARCHAR, 
+		 CREATED_TIME  VARCHAR, 
+		 OPER_MODUL  VARCHAR, 
+		 OPER_TYPE  VARCHAR, 
+		 OPER_DESC  VARCHAR, 
+		 OPER_CONTENT  VARCHAR
+	-->
+<sqlMap namespace="HPRZ001">
+
+	<select id="query" parameterClass="java.util.HashMap" 
+			resultClass="com.baosight.hpjx.hp.rz.domian.HPRZ001">
+		SELECT
+				ID	as "id",  <!-- 主键id -->
+				COMPANY_CODE	as "companyCode",  <!-- 企业编码 -->
+				CREATED_BY	as "createdBy",  <!-- 创建人 -->
+				CREATED_NAME	as "createdName",  <!-- 创建人名称 -->
+				CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
+				OPER_MODUL	as "operModul",  <!-- 操作模块 -->
+				OPER_TYPE	as "operType",  <!-- 操作类型 -->
+				OPER_DESC	as "operDesc",  <!-- 操作说明 -->
+				OPER_CONTENT	as "operContent" <!-- 操作内容 -->
+		FROM hpjx.sys_operation_log WHERE 1=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdName">
+			CREATED_NAME LIKE CONCAT('%',CONCAT( #createdName#,'%'))
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdDateFrom">
+			CREATED_TIME >= #createdDateFrom#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdDateTo">
+			CREATED_TIME <![CDATA[<=]]> #createdDateTo#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operModul">
+			OPER_MODUL = #operModul#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operType">
+			OPER_TYPE = #operType#
+		</isNotEmpty>
+		<dynamic prepend="ORDER BY">
+         <isNotEmpty property="orderBy">
+    		  $orderBy$
+   		 </isNotEmpty>
+   		<isEmpty property="orderBy">
+    		  ID asc
+		</isEmpty>
+  		</dynamic>
+			
+	</select>
+
+	<select id="count" resultClass="int">
+		SELECT COUNT(*) FROM hpjx.sys_operation_log WHERE 1=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdName">
+			CREATED_NAME LIKE CONCAT('%',CONCAT( #createdName#,'%'))
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdDateFrom">
+			CREATED_TIME >= #createdDateFrom#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdDateTo">
+			CREATED_TIME <![CDATA[<=]]> #createdDateTo#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operModul">
+			OPER_MODUL = #operModul#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operType">
+			OPER_TYPE = #operType#
+		</isNotEmpty>
+	</select>
+	
+	<!--  
+		<isNotEmpty prepend=" AND " property="id">
+			ID = #id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdBy">
+			CREATED_BY = #createdBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdName">
+			CREATED_NAME = #createdName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdTime">
+			CREATED_TIME = #createdTime#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operModul">
+			OPER_MODUL = #operModul#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operType">
+			OPER_TYPE = #operType#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operDesc">
+			OPER_DESC = #operDesc#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operContent">
+			OPER_CONTENT = #operContent#
+		</isNotEmpty>
+	-->
+
+	<insert id="insert">
+		INSERT INTO hpjx.sys_operation_log (ID,  <!-- 主键id -->
+										COMPANY_CODE,  <!-- 企业编码 -->
+										CREATED_BY,  <!-- 创建人 -->
+										CREATED_NAME,  <!-- 创建人名称 -->
+										CREATED_TIME,  <!-- 创建时间 -->
+										OPER_MODUL,  <!-- 操作模块 -->
+										OPER_TYPE,  <!-- 操作类型 -->
+										OPER_DESC,  <!-- 操作说明 -->
+										OPER_CONTENT  <!-- 操作内容 -->
+										)		 
+	    VALUES (#id#, #companyCode#, #createdBy#, #createdName#, #createdTime#, #operModul#, #operType#, #operDesc#, #operContent#) 
+	</insert>
+  
+	<delete id="delete">
+		DELETE FROM hpjx.sys_operation_log WHERE 
+			ID = #id#
+	</delete>
+
+	<update id="update">
+		UPDATE hpjx.sys_operation_log 
+		SET 
+					COMPANY_CODE	= #companyCode#,   <!-- 企业编码 -->  
+					CREATED_BY	= #createdBy#,   <!-- 创建人 -->  
+					CREATED_NAME	= #createdName#,   <!-- 创建人名称 -->  
+					CREATED_TIME	= #createdTime#,   <!-- 创建时间 -->  
+					OPER_MODUL	= #operModul#,   <!-- 操作模块 -->  
+					OPER_TYPE	= #operType#,   <!-- 操作类型 -->  
+					OPER_DESC	= #operDesc#,   <!-- 操作说明 -->  
+					OPER_CONTENT	= #operContent#  <!-- 操作内容 -->  
+			WHERE 	
+			ID = #id#
+	</update>
+
+	<!-- 查询操作模块 -->
+	<select id="queryOperModulComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+		SELECT
+		distinct OPER_MODUL	as "operModul"  <!-- 操作模块 -->
+		FROM hpjx.sys_operation_log WHERE 1=1
+	</select>
+
+	<!-- 查询操作类型 -->
+	<select id="queryOperTypeComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+		SELECT
+		distinct OPER_TYPE	as "operType"  <!-- 操作类型 -->
+		FROM hpjx.sys_operation_log WHERE 1=1
+	</select>
+  
+</sqlMap>
\ No newline at end of file

src/main/webapp/HP/RZ/HPRZ001.js

@@ -20,32 +20,6 @@ $(function() {
  * 页面加载时执行
  */
 $(window).load(function () {
-    // 仓库名称
-/*    let inInfo = new EiInfo();
-    inInfo.set("inqu_status-0-inventTypes", [1, 2]);
-    EiCommunicator.send("HPPZ007", "queryComboBox", inInfo, {
-        onSuccess: function (ei) {
-            whNameGlobalData = ei.getBlock("wh_record_block_id").getMappedRows();
-        },
-        onFail: function (ei) {
-        }
-    }, {async: false});
-    // 存货名称
-    EiCommunicator.send("HPPZ004", "queryComboBox", inInfo, {
-        onSuccess: function (ei) {
-            inventNameGlobalData = ei.getBlock("invent_name_block_id").getMappedRows();
-        },
-        onFail: function (ei) {
-        }
-    }, {async: false});
-    // 规格
-    EiCommunicator.send("HPPZ006", "queryComboBoxAll", inInfo, {
-        onSuccess: function (ei) {
-            inventAllGlobalData = ei.getBlock("invent_all_block_id").getMappedRows();
-        },
-        onFail: function (ei) {
-        }
-    }, {async: false});*/
     // 查询
     query();
 });

src/main/webapp/HP/RZ/HPRZ001.jsp

@@ -47,5 +47,9 @@
 
 
 </EF:EFPage>
+<script>
+    var ctx = "${ctx}";
+</script>
+<script src="${ctx}/HP/RZ/HPRZ001.js"></script>