修改登录日志；添加访问首页日志；修改涉企政策列表；

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/dp/DpController.java

@@ -15,6 +15,7 @@ import com.jeeplus.enterpriseproperty.service.EnterprisePropertyService;
 import com.jeeplus.parkmanagement.service.ParkManagementService;
 import com.jeeplus.qyuser.service.QyUserService;
 import com.jeeplus.saleinventory.service.SaleInventoryService;
+import com.jeeplus.sys.constant.enums.LogTypeEnum;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.UserUtils;
 import io.swagger.annotations.Api;
@@ -44,7 +45,7 @@ import java.util.List;
  * @version 2024-11-05
  */
 
-@Api(tags ="企业电费")
+@Api(tags ="涉企政策")
 @RestController
 @RequestMapping(value = "/dp/dp")
 public class DpController {
@@ -78,6 +79,19 @@ public class DpController {
         return ResponseEntity.ok (map);
     }
 
+    /**
+     * 首页登录
+     */
+    @ApiLog(value = "首页访问", type = LogTypeEnum.LOGIN)
+    @ApiOperation(value = "首页访问")
+    @GetMapping("LoginLog")
+    public ResponseEntity<String> LoginLog() throws Exception {
+        //HashMap<String, Object> map=enterpriseInfoService.getInfoStatistics();
+        return ResponseEntity.ok ("首页访问");
+    }
+
+
+
     /**
      * 行业列表
      */

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/controller/EnterpriseElectricityController.java

@@ -32,12 +32,12 @@ import java.io.IOException;
 import java.util.List;
 
 /**
- * 企业电费Controller
+ * 涉企政策Controller
  * @author 尹宇
  * @version 2024-11-05
  */
 
-@Api(tags ="企业电费")
+@Api(tags ="涉企政策")
 @RestController
 @RequestMapping(value = "/enterpriseelectricity/enterpriseElectricity")
 public class EnterpriseElectricityController {
@@ -50,10 +50,10 @@ public class EnterpriseElectricityController {
 	@Autowired
 	private EnterpriseInfoService enterpriseInfoService;
 	/**
-	 * 企业电费列表数据
+	 * 查询涉企政策列表数据
 	 */
-	@ApiLog("查询企业电费列表数据")
-	@ApiOperation(value = "查询企业电费列表数据")
+	@ApiLog("查询涉企政策列表数据")
+	@ApiOperation(value = "查询涉企政策列表数据")
 	@GetMapping("list")
 	public ResponseEntity<IPage<EnterpriseElectricityDTO>> list(EnterpriseElectricityDTO enterpriseElectricityDTO, Page<EnterpriseElectricityDTO> page) throws Exception {
 		QueryWrapper queryWrapper = QueryWrapperGenerator.buildQueryCondition (enterpriseElectricityDTO, EnterpriseElectricityDTO.class);
@@ -63,20 +63,20 @@ public class EnterpriseElectricityController {
 
 
 	/**
-	 * 根据Id获取企业电费数据
+	 * 根据Id获取涉企政策数据
 	 */
-	@ApiLog("根据Id获取企业电费数据")
-	@ApiOperation(value = "根据Id获取企业电费数据")
+	@ApiLog("根据Id获取涉企政策数据")
+	@ApiOperation(value = "根据Id获取涉企政策数据")
 	@GetMapping("queryById")
 	public ResponseEntity<EnterpriseElectricityDTO> queryById(String id) {
 		return ResponseEntity.ok ( enterpriseElectricityWrapper.toDTO ( enterpriseElectricityService.getById ( id ) ) );
 	}
 
 	/**
-	 * 保存企业电费
+	 * 保存涉企政策
 	 */
-	@ApiLog("保存企业电费")
-	@ApiOperation(value = "保存企业电费")
+	@ApiLog("保存涉企政策")
+	@ApiOperation(value = "保存涉企政策")
 	@PreAuthorize("hasAnyAuthority('enterpriseelectricity:enterpriseElectricity:add','enterpriseelectricity:enterpriseElectricity:edit')")
 	@PostMapping("save")
 	public  ResponseEntity <String> save(@Valid @RequestBody EnterpriseElectricityDTO enterpriseElectricityDTO) {
@@ -87,10 +87,10 @@ public class EnterpriseElectricityController {
 
 
 	/**
-	 * 删除企业电费
+	 * 删除涉企政策
 	 */
-	@ApiLog("删除企业电费")
-	@ApiOperation(value = "删除企业电费")
+	@ApiLog("删除涉企政策")
+	@ApiOperation(value = "删除涉企政策")
 	@PreAuthorize("hasAuthority('enterpriseelectricity:enterpriseElectricity:del')")
 	@DeleteMapping("delete")
 	public ResponseEntity <String> delete(String ids) {
@@ -100,14 +100,14 @@ public class EnterpriseElectricityController {
 	}
 
 	/**
-     * 导出企业电费数据
+     * 导出涉企政策数据
      *
      * @param enterpriseElectricityDTO
      * @param page
      * @param response
      * @throws Exception
      */
-    @ApiLog("导出企业电费数据")
+    @ApiLog("导出涉企政策数据")
     @PreAuthorize("hasAnyAuthority('enterpriseelectricity:enterpriseElectricity:export')")
     @GetMapping("export")
     public void exportFile(EnterpriseElectricityDTO enterpriseElectricityDTO, Page <EnterpriseElectricity> page, ExcelOptions options, HttpServletResponse response) throws Exception {
@@ -126,7 +126,7 @@ public class EnterpriseElectricityController {
     }
 
     /**
-     * 导入企业电费数据
+     * 导入涉企政策数据
      *
      * @return
      */
@@ -138,7 +138,7 @@ public class EnterpriseElectricityController {
     }
 
     /**
-     * 下载导入企业电费数据模板
+     * 下载导入涉企政策数据模板
      *
      * @param response
      * @return
@@ -146,9 +146,9 @@ public class EnterpriseElectricityController {
     @PreAuthorize ("hasAnyAuthority('enterpriseelectricity:enterpriseElectricity:import')")
     @GetMapping("import/template")
     public void importFileTemplate(HttpServletResponse response) throws IOException {
-        String fileName = "企业电费数据导入模板.xlsx";
+        String fileName = "涉企政策数据导入模板.xlsx";
         List<EnterpriseElectricityDTO> list = Lists.newArrayList();
-        EasyExcelUtils.newInstance ( enterpriseElectricityService, enterpriseElectricityWrapper ).exportExcel ( list,  "企业电费数据", EnterpriseElectricityDTO.class, fileName, null, response );
+        EasyExcelUtils.newInstance ( enterpriseElectricityService, enterpriseElectricityWrapper ).exportExcel ( list,  "涉企政策数据", EnterpriseElectricityDTO.class, fileName, null, response );
     }
 
 }

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/domain/EnterpriseElectricity.java

@@ -9,7 +9,7 @@ import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 /**
- * 企业电费Entity
+ * 涉企政策Entity
  * @author 尹宇
  * @version 2024-11-05
  */

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/mapper/EnterpriseElectricityMapper.java

@@ -14,7 +14,7 @@ import com.jeeplus.enterpriseother.service.dto.EnterpriseOtherDTO;
 import org.apache.ibatis.annotations.Param;
 
 /**
- * 企业电费MAPPER接口
+ * 涉企政策MAPPER接口
  * @author 尹宇
  * @version 2024-11-05
  */

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/service/EnterpriseElectricityService.java

@@ -15,7 +15,7 @@ import com.jeeplus.enterpriseelectricity.domain.EnterpriseElectricity;
 import com.jeeplus.enterpriseelectricity.mapper.EnterpriseElectricityMapper;
 
 /**
- * 企业电费Service
+ * 涉企政策Service
  * @author 尹宇
  * @version 2024-11-05
  */

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseelectricity/service/dto/EnterpriseElectricityDTO.java

@@ -15,7 +15,7 @@ import com.jeeplus.core.service.dto.BaseDTO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 /**
- * 企业电费DTO
+ * 涉企政策DTO
  * @author 尹宇
  * @version 2024-11-05
  */

jp-console/jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/security/config/WebSecurityConfig.java

@@ -77,6 +77,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                         "/buildinginfo/buildingManagement/list",
                         "/buildinginfo/buildingManagement/queryById",
                         "/enterpriseother/enterpriseOther/queryById",
+                        "/dp/dp/LoginLog",
 
                         "/enterpriseother/enterpriseOther/list",
                         "/enterpriseinfo/enterpriseInfo/queryById",

jp-mobile/api/auth/loginService.js

@@ -46,6 +46,14 @@ export default {
 	    })
 	},
 	
+	LoginLog: function (params) {
+	    return request({
+	        url: '/dp/dp/LoginLog',
+	        method: 'get',
+	        params: params
+	    })
+	},
+	
 	InfoStatistics_industry: function (params) {
 	    return request({
 	        url: '/dp/dp/InfoStatistics_industry',

jp-mobile/pages/index/Tabindex.vue

@@ -141,9 +141,9 @@
 		
 		created() {
 			this.getPageInfo();
-			this.getParkList()
-			this.getParkList2()	
-			this.getParkList3()	
+			// this.getParkList()
+			// this.getParkList2()	
+			// this.getParkList3()	
 		},
 
 
@@ -350,8 +350,8 @@
 			},
 			
 			getPageInfo() {
-			  loginService.InfoStatistics({}).then(({ data }) => {
-			    this.pageInfo = data;
+			  loginService.LoginLog({}).then(({ data }) => {
+			    //this.pageInfo = data;
 				
 				//103改为 14/103
 				

jp-mobile/pages/index/index.vue

@@ -232,9 +232,9 @@
 							
 			</view> -->
 			
-			<view   @click="outlogin" class="fixed-bottom-right" v-if="isLogin!=null">
+			<!-- <view   @click="outlogin" class="fixed-bottom-right" v-if="isLogin!=null">
 				<image  class="center-img2" src="/static/img/icon_logout.png"></image>
-			</view>
+			</view> -->
 			
 			
 		</view>

jp-mobile/pages/policy/policyList.vue

@@ -56,16 +56,16 @@
 							
 							<view class="item-title">
 								
-								<span v-if="item.des2 === '1'">【工业】</span>
-								<span v-else-if="item.des2 === '2'">【科技】</span>
-								<span v-else-if="item.des2 === '3'">【发改】</span>
-								<span v-else-if="item.des2 === '4'">【商务】</span>
-								<span v-else-if="item.des2 === '5'">【人才政策】</span>
+								<span class="color-cheng" v-if="item.des2 === '1'">【工业】</span>
+								<span class="color-cheng" v-else-if="item.des2 === '2'">【科技】</span>
+								<span class="color-cheng" v-else-if="item.des2 === '3'">【发改】</span>
+								<span class="color-cheng" v-else-if="item.des2 === '4'">【商务】</span>
+								<span class="color-cheng" v-else-if="item.des2 === '5'">【人才政策】</span>
 								
-								<span v-if="item.des3 === '1'">【国家】</span>
-								<span v-else-if="item.des3 === '2'">【省级】</span>
-								<span v-else-if="item.des3 === '3'">【市级】</span>
-								<span v-else-if="item.des3 === '4'">【区级】</span>
+								<span class="color-lan" v-if="item.des3 === '1'">【国家】</span>
+								<span class="color-lan" v-else-if="item.des3 === '2'">【省级】</span>
+								<span class="color-lan" v-else-if="item.des3 === '3'">【市级】</span>
+								<span class="color-lan" v-else-if="item.des3 === '4'">【区级】</span>
 								{{item.des1}}
 							</view>
 
@@ -590,4 +590,12 @@
 		font-size: 40rpx;
 		line-height: 60rpx;
 	}
+	.color-cheng{
+		color: #f47920;
+		
+	}
+	.color-lan{
+		color: #4285f4;
+		
+	}
 </style>

jp-ui/src/views/modules/sys/log/LogList.vue

@@ -92,7 +92,7 @@
               </template>
             </vxe-column>
           <vxe-column width="150"  title="访问功能" field="title" sortable></vxe-column>
-   
+
           <vxe-column width="150"  title="URI" field="requestUri" sortable></vxe-column>
           <vxe-column width="100"  title="提交方式" field="requestType" sortable></vxe-column>
           <vxe-column width="150"  title="访问方法" field="method" sortable></vxe-column>
@@ -101,7 +101,23 @@
           <vxe-column width="150"  title="返回结果" field="result" sortable></vxe-column>
           <vxe-column width="150"  title="公司" field="createBy.companyDTO.name" sort-by="c.name" sortable></vxe-column>
           <vxe-column width="100"  title="部门" field="createBy.officeDTO.name" sort-by="o.name" sortable></vxe-column>
-          <vxe-column width="90"  fixed="right" title="用户" field="createBy.name" sort-by="u.name" sortable></vxe-column>
+          <!-- <vxe-column width="90"  fixed="right" title="用户" field="createBy.name" sort-by="u.name" sortable></vxe-column> -->
+
+
+
+
+          <vxe-column
+          width="150"
+              field="title"
+              sortable
+              title="用户">
+              <template slot-scope="scope">
+
+                   <span v-if="scope.row.createBy!=undefined ">{{ scope.row.createBy.name }}</span>
+                   <span v-else>游客</span>
+              </template>
+            </vxe-column>
+
           <vxe-column width="85"  fixed="right" title="IP地址" field="remoteAddr" sortable></vxe-column>
           <vxe-column width="170" fixed="right" title="访问时间" field="createDate" sort-by="a.create_date" sortable></vxe-column>
         </vxe-table>